From b5cb62270a972b32a06ad46a6b0492d3b2c28875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Thu, 14 Sep 2023 09:53:24 +0200
Subject: [PATCH] Use the long tag names

---
 .github/workflows/main.yaml                                   | 2 +-
 .github/workflows/qgis.yaml                                   | 4 ++++
 Dockerfile                                                    | 2 +-
 docker/test-mapserver/Dockerfile                              | 2 +-
 .../create/{{cookiecutter.project}}/docker-compose-lib.yaml   | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 94f7396779..f41c1c1912 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -52,7 +52,7 @@ jobs:
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
       - run: |
           python3 -m venv /tmp/venv
-          /tmp/venv/bin/pip install c2cciutils==1.3.dev20220810070904
+          /tmp/venv/bin/pip install c2cciutils==1.4.13
           /tmp/venv/bin/c2cciutils-download-applications --applications-file=ci/applications.yaml \
             --versions-file=ci/applications-versions.yaml
           rm -rf /tmp/venv
diff --git a/.github/workflows/qgis.yaml b/.github/workflows/qgis.yaml
index f67e68ed14..7bb545336d 100644
--- a/.github/workflows/qgis.yaml
+++ b/.github/workflows/qgis.yaml
@@ -21,6 +21,10 @@ jobs:
           - '3.22'
           # Last LTR
           - '3.28'
+          - 3.28-gdal3.6
+        # Will be soon:
+        #  - 3.28-gdal3.7
+        #  - ltr
 
     env:
       MAIN_BRANCH: '2.7'
diff --git a/Dockerfile b/Dockerfile
index 31863eee55..e231e8ee55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -92,7 +92,7 @@ WORKDIR /opt/c2cgeoportal
 COPY ci/applications*.yaml ./
 RUN \
   python3 -m venv venv && \
-  venv/bin/pip install c2cciutils==1.3.dev20220810070904 && \
+  venv/bin/pip install c2cciutils==1.4.13 && \
   venv/bin/c2cciutils-download-applications --applications-file=applications.yaml --versions-file=applications-versions.yaml && \
   rm -rf venv
 
diff --git a/docker/test-mapserver/Dockerfile b/docker/test-mapserver/Dockerfile
index fd6b1191dc..6271438c35 100644
--- a/docker/test-mapserver/Dockerfile
+++ b/docker/test-mapserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM camptocamp/mapserver:7.6
+FROM camptocamp/mapserver:7.6-gdal3.3
 LABEL maintainer Camptocamp "info@camptocamp.com"
 
 RUN \
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml
index ae9d080ed5..c2fd527ef5 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml
@@ -74,7 +74,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:7.6-20-04
+    image: camptocamp/mapserver:7.6-gdal3.3
     user: www-data
     restart: unless-stopped
     entrypoint: []