build QGIS Docker on cron jobs

3nids · 3nids · commit 6896ea27ffdb · 2018-02-20T07:41:06.000-04:00
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -26,12 +26,12 @@ 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}" .
+  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_PUSH =~ true ]]; then
+if [[ $DOCKER_DEPS_PUSH =~ true ]]; then
   docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
   #docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:latest"
   docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -15,8 +15,21 @@
 
 set -e
 
-DIR=$(git rev-parse --show-toplevel)/.docker
+
 
 mkdir -p $CCACHE_DIR
 
-docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
+if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
+  DIR=$(git rev-parse --show-toplevel)/.docker
+  pushd ${DIR}
+  echo "${bold}Building QGIS Docker image...${endbold}"
+  docker build -v /root/QGIS:/root/QGIS --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
+  popd
+else
+  docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
+fi
diff --git a/.docker/Dockerfile-build-test b/.docker/Dockerfile-build-test
diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -17,22 +17,23 @@ COPY . /usr/src/QGIS
 WORKDIR /usr/src/QGIS/build
 
 RUN cmake \
- -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBINDINGS_GLOBAL_INSTALL=ON \
- -DWITH_STAGED_PLUGINS=ON \
- -DWITH_GRASS=ON \
- -DWITH_3D=ON \
- -DSUPPRESS_QT_WARNINGS=ON \
- -DENABLE_TESTS=OFF \
- -DWITH_QSPATIALITE=ON \
- -DWITH_QWTPOLAR=OFF \
- -DWITH_APIDOC=OFF \
- -DWITH_ASTYLE=OFF \
- -DWITH_DESKTOP=ON \
- -DWITH_BINDINGS=ON \
- -DDISABLE_DEPRECATED=ON \
+  -GNinja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DWITH_DESKTOP=OFF \
+  -DWITH_SERVER=ON \
+  -DWITH_3D=ON \
+  -DWITH_BINDINGS=ON \
+  -DBINDINGS_GLOBAL_INSTALL=ON \
+  -DWITH_STAGED_PLUGINS=ON \
+  -DWITH_GRASS=ON \
+  -DSUPPRESS_QT_WARNINGS=ON \
+  -DDISABLE_DEPRECATED=ON \
+  -DENABLE_TESTS=OFF \
+  -DWITH_QSPATIALITE=ON \
+  -DWITH_QWTPOLAR=OFF \
+  -DWITH_APIDOC=OFF \
+  -DWITH_ASTYLE=OFF \
  .. \
  && ninja install \
  && rm -rf /usr/src/QGIS
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,11 @@ matrix:
         - TRAVIS_CONFIG=linux
         - 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_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   
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty
       sudo: false
