File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ ARG DOCKER_TAG=latest
66ARG CACHE_DIR
77
88FROM qgis/qgis3-build-deps:${DOCKER_TAG}
9- MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com >
9+ MAINTAINER Denis Rouzaud <denis@opengis.ch >
1010
1111ENV CC=/usr/lib/ccache/clang
1212ENV CXX=/usr/lib/ccache/clang++
Original file line number Diff line number Diff line change 11FROM ubuntu:18.04
2- MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com >
2+ MAINTAINER Denis Rouzaud <denis@opengis.ch >
33
44LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
55
Original file line number Diff line number Diff line change @@ -9,10 +9,10 @@ matrix:
99 - TRAVIS_CONFIG=linux
1010 - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
1111 - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
12- - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
12+ - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
1313 - DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
1414 # on cron job, QGIS image is built and push without testing
15- - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true " ) # TODO: else false
15+ - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "false " )
1616 - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
1717 - CCACHE_DIR=${HOME}/.ccache
1818 dist : trusty
You can’t perform that action at this time.
0 commit comments