fix dockerfile path so it matches master (#44575)

qgis · Aug 5, 2021 · ebabe09 · ebabe09
1 parent ba33a2d
commit ebabe09
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile → .docker/qgis3-qt5-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile → .docker/qgis3-qt5-build-deps.dockerfile
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -43,7 +43,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
       CC: /usr/lib/ccache/gcc
       CXX: /usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not
-      DOCKER_BUILD_DEPS_FILE: qgis3-build-deps.dockerfile
+      DOCKER_BUILD_DEPS_FILE: qgis3-qt5-build-deps.dockerfile
 
     strategy:
       matrix: ${{ fromJSON( needs.define-strategy.outputs.matrix ) }}

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -84,7 +84,7 @@ jobs:
         run: |
           pushd .docker
           docker pull qgis/qgis3-build-deps:${DOCKER_TAG} || true
-          docker build --build-arg UBUNTU_BASE=${UBUNTU_BASE} --cache-from qgis/qgis3-build-deps:${DOCKER_TAG} -t qgis/qgis3-build-deps:${DOCKER_TAG} -f qgis3-build-deps.dockerfile .
+          docker build --build-arg UBUNTU_BASE=${UBUNTU_BASE} --cache-from qgis/qgis3-build-deps:${DOCKER_TAG} -t qgis/qgis3-build-deps:${DOCKER_TAG} -f qgis3-qt5-build-deps.dockerfile .
           popd
 
       - name: Push deps image
@@ -302,7 +302,7 @@ jobs:
           pushd .docker
           TARGET=$( ( [[ ${TEST_BATCH} == "ORACLE"   ]] && echo "binary-for-oracle" ) \
                  || echo "binary-only" )
-          docker build --target $TARGET --build-arg UBUNTU_BASE=${UBUNTU_BASE} --cache-from qgis/qgis3-build-deps:${DOCKER_TAG} -t qgis/qgis3-build-deps-bin-only:${DOCKER_TAG} -f qgis3-build-deps.dockerfile .
+          docker build --target $TARGET --build-arg UBUNTU_BASE=${UBUNTU_BASE} --cache-from qgis/qgis3-build-deps:${DOCKER_TAG} -t qgis/qgis3-build-deps-bin-only:${DOCKER_TAG} -f qgis3-qt5-build-deps.dockerfile .
           popd
 
       - name: Print disk space