drop bionic, all images are now focal based

qgis · Aug 22, 2020 · 8496807 · 8496807
1 parent bf13801
commit 8496807
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -1,9 +1,9 @@
 
 # see https://docs.docker.com/docker-cloud/builds/advanced/
 # using ARG in FROM requires min v17.05.0-ce
-ARG DOCKER_TAG=latest
+ARG DOCKER_DEPS_TAG=latest
 
-FROM  qgis/qgis3-build-deps:${DOCKER_TAG} AS BUILDER
+FROM  qgis/qgis3-build-deps:${DOCKER_DEPS_TAG} AS BUILDER
 MAINTAINER Denis Rouzaud <denis@opengis.ch>
 
 LABEL Description="Docker container with QGIS" Vendor="QGIS.org" Version="1.1"

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -41,6 +41,7 @@ jobs:
         run: |
           export DOCKER_TAG=${branch//master/latest}
           export DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-focal.dockerfile
+          export DOCKER_DEPS_TAG=${DOCKER_TAG}_focal
 
           echo "branch: ${branch}"
           echo "docker tag: ${DOCKER_TAG}"
@@ -52,17 +53,17 @@ jobs:
           echo "##[group] QGIS deps Docker pull/rebuild"
           cd .docker
           docker --version
-          docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}_focal" || true
-          docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}_focal" -t "qgis/qgis3-build-deps:${DOCKER_TAG}_focal" -f ${DOCKER_BUILD_DEPS_FILE} .
-          echo "push to qgis/qgis3-build-deps:${DOCKER_TAG}_focal"
+          docker pull "qgis/qgis3-build-deps:${DOCKER_DEPS_TAG}" || true
+          docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_DEPS_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_DEPS_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
+          echo "push to qgis/qgis3-build-deps:${DOCKER_DEPS_TAG}"
           docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-          docker push "qgis/qgis3-build-deps:${DOCKER_TAG}_focal"
+          docker push "qgis/qgis3-build-deps:${DOCKER_DEPS_TAG}"
           echo "##[endgroup]"
 
           echo "##[group] Docker QGIS build"
-          DOCKER_BUILD_ARGS="--build-arg 'DOCKER_TAG=${DOCKER_TAG}_focal' --build-arg CC --build-arg CXX"
+          DOCKER_BUILD_ARGS="--build-arg DOCKER_DEPS_TAG --build-arg CC --build-arg CXX"
           docker build ${DOCKER_BUILD_ARGS} \
-                       --cache-from "qgis/qgis:${DOCKER_TAG}_focal" \
+                       --cache-from "qgis/qgis:${DOCKER_TAG}" \
                        -t "qgis/qgis:BUILDER" \
                        -f qgis.dockerfile ..
           echo "Copy build cache from Docker container to Travis cache directory"