Merge pull request #43911 from nicogodet/nicogodet-patch-ogctest

fix OGC test
qgis · Jun 24, 2021 · 7c69504 · 7c69504
1 parent f29ecd6
commit 7c69504
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.ci/ogc/docker-compose.yml b/.ci/ogc/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - qgis-server
 
   qgis-server:
-    image: qgis_server_deps
+    image: ${DOCKER_IMAGE}
     container_name: qgis_server_deps
     volumes:
       - ./../../:/usr/src/qgis/

diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml
@@ -96,3 +96,5 @@ jobs:
         run: |
           docker-compose -f .ci/ogc/docker-compose.yml up -d
           source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver
+        env:
+          DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }}