Skip to content

Commit

Permalink
Merge pull request #10669 from camptocamp/long-tags-27-gsgmf-2033
Browse files Browse the repository at this point in the history
Use the long tag names
  • Loading branch information
sbrunner authored Sep 14, 2023
2 parents a424836 + b5cb622 commit e65db1a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/qgis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/test-mapserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM camptocamp/mapserver:7.6
FROM camptocamp/mapserver:7.6-gdal3.3
LABEL maintainer Camptocamp "[email protected]"

RUN \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down

0 comments on commit e65db1a

Please sign in to comment.