[docker] allow updating dependencies

this is triggered by a commit message: [docker] update dependencies
qgis · Dec 12, 2017 · 6f47c6a · 6f47c6a
1 parent cda271f
commit 6f47c6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -23,7 +23,11 @@ docker-compose --version
 docker-compose -f $DOCKER_COMPOSE config
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
+  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+else
+  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+fi
 echo "travis_fold:end:docker"
 # image should be pushed even if QGIS build fails
 # but push is achieved only on branches (not for PRs)

diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ matrix:
         - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
         - DOCKER_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
+        - DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty
       sudo: false