From e33d8085d46e39b1d2903a3d92c0da17c2920a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Neunh=C3=B6ffer?= Date: Wed, 24 Jan 2018 15:18:28 +0100 Subject: [PATCH] Make sure docker tag is stored. (#4420) --- scripts/build-docker.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 3a51b75f35..890105077c 100755 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -49,6 +49,12 @@ else (cd ${BUILDDIR}/.arangodb-docker && git pull) fi +# Clean build tag +( + cd ${BUILDDIR}/.arangodb-docker + rm -f .docker-tag +) + # Build stretch package docker run -i \ -e GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \ @@ -63,6 +69,8 @@ docker run -i \ cp -a ${ROOTDIR}/build-tmp/${DEBIMAGE_NAME}.deb ${BUILDDIR}/.arangodb-docker/arangodb.deb # Build docker image -cd ${BUILDDIR}/.arangodb-docker -docker build -f ${DOCKERFILENAME} -t arangodb:${DOCKERTAG} . -cd ${ROOTDIR} +( + cd ${BUILDDIR}/.arangodb-docker + docker build -f ${DOCKERFILENAME} -t arangodb:${DOCKERTAG} . + echo "${DOCKERTAG}" > .docker-tag +)