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

reorg: using a common Docker context

It was only out of habit that having two separate directories
made sense.
parent 6b7e7c0cb8ca
......@@ -23,8 +23,7 @@
set -u
set -x
cp $CI_PROJECT_DIR/requirements.txt $CI_PROJECT_DIR/rolling-hg/
for HG_BRANCH in default stable; do
DESTINATION=${CI_REGISTRY_IMAGE}/hg-${HG_BRANCH}:${TAG}
echo "Building with kaniko, pushing to ${DESTINATION}"
......@@ -27,9 +26,9 @@
for HG_BRANCH in default stable; do
DESTINATION=${CI_REGISTRY_IMAGE}/hg-${HG_BRANCH}:${TAG}
echo "Building with kaniko, pushing to ${DESTINATION}"
/kaniko/executor --context $CI_PROJECT_DIR/rolling-hg \
--dockerfile $CI_PROJECT_DIR/rolling-hg/Dockerfile \
/kaniko/executor --context $CI_PROJECT_DIR/context \
--dockerfile $CI_PROJECT_DIR/Dockerfile.rolling-hg \
--build-arg HG_BRANCH=${HG_BRANCH} \
--build-arg PYDEPS_TAG=${PYDEPS_TAG} \
--single-snapshot \
......@@ -40,5 +39,4 @@
DESTINATION=${CI_REGISTRY_IMAGE}/hg-current:${TAG}
echo "Building with kaniko, pushing to ${DESTINATION}"
cp $CI_PROJECT_DIR/requirements.txt $CI_PROJECT_DIR/released-hg/
# TODO put released hg version to use in a separate file for better clarity
......@@ -44,6 +42,6 @@
# TODO put released hg version to use in a separate file for better clarity
/kaniko/executor --context $CI_PROJECT_DIR/released-hg \
--dockerfile $CI_PROJECT_DIR/released-hg/Dockerfile \
/kaniko/executor --context $CI_PROJECT_DIR/context \
--dockerfile $CI_PROJECT_DIR/Dockerfile.released-hg \
--build-arg HG_VERSION=5.5.2 \
--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