Skip to content
Permalink
Browse files

[docker] allow updating dependencies

this is triggered by a commit message:
[docker] update dependencies
  • Loading branch information
3nids committed Dec 11, 2017
1 parent cda271f commit 6f47c6a4f9bca9bc6998b1bbd227d639f55b7ef6
Showing with 6 additions and 1 deletion.
  1. +5 −1 .ci/travis/linux/before_script.sh
  2. +1 −0 .travis.yml
@@ -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)
@@ -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

0 comments on commit 6f47c6a

Please sign in to comment.
You can’t perform that action at this time.