Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gitlab #84

Merged
merged 7 commits into from May 10, 2019
Merged

Gitlab #84

merged 7 commits into from May 10, 2019

Conversation

jgmize
Copy link
Contributor

@jgmize jgmize commented May 8, 2019

@jgmize jgmize marked this pull request as ready for review May 8, 2019 18:16
@jgmize jgmize requested a review from jpetto May 8, 2019 18:16
Copy link
Contributor

@jpetto jpetto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No blockers, just a few questions for my own understanding. 😀

script:
- docker/bin/build_images.sh
- docker/bin/push2dockerhub.sh
- bin/update-config.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we can't have these two combined (adding an entry in only)? Or are they just separated for now to call out that one is testing and will be deleted later?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as discussed on zoom, let's keep both jobs for now, and we can use the gitlab branch in the furture for testing new versions of .gitlab-ci.yml outside of the master branch.

@@ -5,10 +5,6 @@ set -ex
BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $BIN_DIR/set_git_env_vars.sh

DOCKER_USERNAME="${DOCKER_USERNAME:-mozjenkins}"

docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming these are now set in the cluster?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the credentials are stored on the runner instances and interactive login using a password from an env var is neither needed nor desired.

image_tag="mozorg/bedrock_${2}:${GIT_COMMIT}"
cmd="$3"
docker run --rm --user $(id -u) -v "$PWD:/app" --env-file "docker/envfiles/${env_file}.env" "$image_tag" bash -c "$cmd"
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my own edification, why do we no longer need this?

@jpetto jpetto merged commit 3e42d88 into master May 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants