do not docker compose when building QGIS image

Author: 3nids

.ci/travis/linux/before_script.sh

@@ -18,17 +18,24 @@ set -e
 pushd .docker
 
 echo "travis_fold:start:docker"
+
 docker --version
-docker-compose --version
-docker-compose -f $DOCKER_COMPOSE config
-#docker pull ubuntu:16.04
+
+if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then
+  docker-compose --version
+  docker-compose -f $DOCKER_COMPOSE config
+fi
+
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
+
 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}" -f qgis3-build-deps.dockerfile .
 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)
 if [[ $DOCKER_DEPS_PUSH =~ true ]]; then

.ci/travis/linux/script.sh

@@ -19,16 +19,14 @@ set -e
 
 mkdir -p $CCACHE_DIR
 
-if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
+if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
   DIR=$(git rev-parse --show-toplevel)/.docker
   pushd ${DIR}
   echo "${bold}Building QGIS Docker image...${endbold}"
   docker build --build-arg CACHE_DIR=/root/.ccache --cache-from "qgis/qgis:${DOCKER_TAG}" -t "qgis/qgis:${DOCKER_TAG}" -f qgis.dockerfile .
-  if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
-    echo "${bold}Pushing image to docker hub...${endbold}"
-    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-    docker push "qgis/qgis:${DOCKER_TAG}"
-  fi
+  echo "${bold}Pushing image to docker hub...${endbold}"
+  docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+  docker push "qgis/qgis:${DOCKER_TAG}"
   popd
 else
   docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps

.travis.yml

@@ -12,8 +12,8 @@ matrix:
         - DOCKER_DEPS_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" )
         # on cron job, QGIS image is built and push without testing
-        - DOCKER_QGIS_IMAGE_PUSH=$( [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
-        - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds   
+        - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
+        - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty
       sudo: false