Skip to content

Commit 3e6d164

Browse files
committed
do not docker compose when building QGIS image
1 parent 720de72 commit 3e6d164

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.ci/travis/linux/before_script.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,24 @@ set -e
1818
pushd .docker
1919

2020
echo "travis_fold:start:docker"
21+
2122
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+
2529
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
30+
2631
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
2732
docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
2833
else
2934
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
3035
fi
36+
3137
echo "travis_fold:end:docker"
38+
3239
# image should be pushed even if QGIS build fails
3340
# but push is achieved only on branches (not for PRs)
3441
if [[ $DOCKER_DEPS_PUSH =~ true ]]; then

.ci/travis/linux/script.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@ set -e
1919

2020
mkdir -p $CCACHE_DIR
2121

22-
if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
22+
if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
2323
DIR=$(git rev-parse --show-toplevel)/.docker
2424
pushd ${DIR}
2525
echo "${bold}Building QGIS Docker image...${endbold}"
2626
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}"
3230
popd
3331
else
3432
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ matrix:
1212
- DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && 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_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
1717
- CCACHE_DIR=${HOME}/.ccache
1818
dist: trusty
1919
sudo: false

0 commit comments

Comments
 (0)