Revert "more fixes"

This reverts commit 1d3c4d9.
qgis · Sep 16, 2017 · f85e913 · f85e913
1 parent e8bd70b
commit f85e913
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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,6 +30,5 @@ 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,5 +1,7 @@
 
-FROM      qgis/qgis3-build-deps:current_build
+ARG DOCKER_TAG=latest
+
+FROM      qgis/qgis3-build-deps:$DOCKER_TAG
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 RUN ls /root/.ccache