Read about our upcoming Code of Conduct on this issue

Commit d24214c5 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Partial merge of stable branch into default branch

The main change for builds on the default branch is that they will
have the `default` tag.

This merge also reduces divergence of both branches.
Pipeline #13943 passed with stage
in 18 minutes and 26 seconds
......@@ -6,15 +6,11 @@ mkdir -p /kaniko/.docker
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
if [ "$CI_COMMIT_HG_BRANCH" = "stable" ]; then
PYDEPS_TAG="stable"
else
PYDEPS_TAG="latest"
fi
PYDEPS_TAG="latest"
if [ "$CI_COMMIT_BRANCH" = "branch/default" ]; then
TAG="latest"
elif [ "$CI_COMMIT_HG_BRANCH" = "branch/stable" ]; then
TAG="default"
elif [ "$CI_COMMIT_BRANCH" = "branch/stable" ]; then
TAG="stable"
else
TAG="$CI_COMMIT_HG_SHORT_SHA"
......@@ -43,5 +39,6 @@ echo "Building with kaniko, pushing to ${DESTINATION}"
/kaniko/executor --context $CI_PROJECT_DIR/context \
--dockerfile $CI_PROJECT_DIR/Dockerfile.released-hg \
--build-arg HG_VERSION=5.5.2 \
--reproducible \
--build-arg PYDEPS_TAG=${PYDEPS_TAG} \
--destination $DESTINATION
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment