From 2b149ad1849c24ab42eef47cd4834f2d7b814e81 Mon Sep 17 00:00:00 2001
From: Just van den Broecke <just@justobjects.nl>
Date: Tue, 27 Sep 2022 21:19:38 +0200
Subject: [PATCH] fix for issue 989 - get Docker build/push working (#997)

* fix for issue 989 - get Docker build/push working - try 1

* fix for issue 989 - get Docker build/push working - try 2 - remove tests - new WFS GeoSolutions
---
 .github/workflows/containers.yml   | 29 +++++++++++++++--------------
 docker/default.config.yml          |  2 +-
 tests/pygeoapi-test-ogr-config.yml |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 3a91e22..679b7b1 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -11,7 +11,8 @@ on:
     types: [completed]
     
 env:
-  TEST_TAG: ${{ secrets.DOCKER_REPOSITORY }}:test    
+  DOCKER_REPOSITORY: geopython/pygeoapi
+  DOCKER_TEST_IMAGE: geopython/pygeoapi:test
 
 jobs:
   on-success:
@@ -24,43 +25,43 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
-        
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-      
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1  
-      
+        uses: docker/setup-buildx-action@v1
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
       - name: Log in to the Container registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          
+
       - name: Build and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
           load: true
-          tags: ${{ env.TEST_TAG }} 
-  
-      - name: pygeoapi Unit Tests with Docker Image ⚙️
-        run: |
-          docker run --entrypoint "/entrypoint.sh" --rm ${{ env.TEST_TAG }}    
-      
+          tags: ${{ env.DOCKER_TEST_IMAGE }}
+
+#      - name: pygeoapi Unit Tests with Docker Image ⚙️
+#        run: |
+#          docker run --entrypoint "/entrypoint.sh" --rm ${{ env.DOCKER_TEST_IMAGE }} test
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: |
-            ${{ secrets.DOCKER_REPOSITORY }}
+            ${{ env.DOCKER_REPOSITORY }}
             ghcr.io/${{ github.repository }}   
           tags: |
             type=semver,pattern={{version}}
diff --git a/docker/default.config.yml b/docker/default.config.yml
index b8da4b5..3bd0c16 100644
--- a/docker/default.config.yml
+++ b/docker/default.config.yml
@@ -302,7 +302,7 @@ resources:
               name: OGR
               data:
                   source_type: WFS
-                  source: WFS:https://demo.geo-solutions.it/geoserver/wfs
+                  source: WFS:https://gs-stable.geosolutionsgroup.com/geoserver/wfs
                   source_srs: EPSG:32632
                   target_srs: EPSG:4326
                   source_capabilities:
diff --git a/tests/pygeoapi-test-ogr-config.yml b/tests/pygeoapi-test-ogr-config.yml
index 2592087..05cecdb 100644
--- a/tests/pygeoapi-test-ogr-config.yml
+++ b/tests/pygeoapi-test-ogr-config.yml
@@ -252,7 +252,7 @@ resources:
               name: OGR
               data:
                   source_type: WFS
-                  source: WFS:https://demo.geo-solutions.it/geoserver/wfs
+                  source: WFS:https://gs-stable.geosolutionsgroup.com/geoserver/wfs
                   source_srs: EPSG:32632
                   target_srs: EPSG:4326
                   source_capabilities: