File tree 3 files changed +16
-11
lines changed
3 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -18,17 +18,24 @@ set -e
18
18
pushd .docker
19
19
20
20
echo " travis_fold:start:docker"
21
+
21
22
docker --version
22
- docker-compose --version
23
- docker-compose -f $DOCKER_COMPOSE config
24
- # docker pull ubuntu:16.04
23
+
24
+ if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then
25
+ docker-compose --version
26
+ docker-compose -f $DOCKER_COMPOSE config
27
+ fi
28
+
25
29
docker pull " qgis/qgis3-build-deps:${DOCKER_TAG} " || true
30
+
26
31
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
27
32
docker build --no-cache -t " qgis/qgis3-build-deps:${DOCKER_TAG} " .
28
33
else
29
34
docker build --cache-from " qgis/qgis3-build-deps:${DOCKER_TAG} " -t " qgis/qgis3-build-deps:${DOCKER_TAG} " -f qgis3-build-deps.dockerfile .
30
35
fi
36
+
31
37
echo " travis_fold:end:docker"
38
+
32
39
# image should be pushed even if QGIS build fails
33
40
# but push is achieved only on branches (not for PRs)
34
41
if [[ $DOCKER_DEPS_PUSH =~ true ]]; then
Original file line number Diff line number Diff line change @@ -19,16 +19,14 @@ set -e
19
19
20
20
mkdir -p $CCACHE_DIR
21
21
22
- if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
22
+ if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
23
23
DIR=$( git rev-parse --show-toplevel) /.docker
24
24
pushd ${DIR}
25
25
echo " ${bold} Building QGIS Docker image...${endbold} "
26
26
docker build --build-arg CACHE_DIR=/root/.ccache --cache-from " qgis/qgis:${DOCKER_TAG} " -t " qgis/qgis:${DOCKER_TAG} " -f qgis.dockerfile .
27
- if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
28
- echo " ${bold} Pushing image to docker hub...${endbold} "
29
- docker login -u=" $DOCKER_USERNAME " -p=" $DOCKER_PASSWORD "
30
- docker push " qgis/qgis:${DOCKER_TAG} "
31
- fi
27
+ echo " ${bold} Pushing image to docker hub...${endbold} "
28
+ docker login -u=" $DOCKER_USERNAME " -p=" $DOCKER_PASSWORD "
29
+ docker push " qgis/qgis:${DOCKER_TAG} "
32
30
popd
33
31
else
34
32
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ matrix:
12
12
- DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
13
13
- DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
14
14
# on cron job, QGIS image is built and push without testing
15
- - DOCKER_QGIS_IMAGE_PUSH =$( [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
16
- - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
15
+ - DOCKER_QGIS_IMAGE_BUILD_PUSH =$( [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
16
+ - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
17
17
- CCACHE_DIR=${HOME}/.ccache
18
18
dist : trusty
19
19
sudo : false
You can’t perform that action at this time.
0 commit comments