more fixes

qgis · Aug 13, 2017 · e0d198f97138e4437d4b7ed88e0ac43ac2619023 · e0d198f
1 parent d36e5b8
commit e0d198f97138e4437d4b7ed88e0ac43ac2619023
Unified Split

Showing with 3 additions and 4 deletions.

+2 −1 .ci/travis/linux/before_script.sh

+1 −3 .docker/Dockerfile-build-test
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -21,7 +21,7 @@ docker --version
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
 docker build --file Dockerfile-deps \
-             --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
+             --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" \
              --tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
 # image should be pushed even if QGIS build fails
 # but push is achieved only on branches (not for PRs)
@@ -30,5 +30,6 @@ if [[ $DOCKER_PUSH =~ true ]]; then
   #docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:latest"
   docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
 fi
+docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:current_build"
 
 popd
diff --git a/.docker/Dockerfile-build-test b/.docker/Dockerfile-build-test
@@ -1,7 +1,5 @@
 
-ARG DOCKER_TAG=latest
-
-FROM      qgis/qgis3-build-deps:$DOCKER_TAG
+FROM      qgis/qgis3-build-deps:current_build
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 RUN ls /root/.ccache