Skip to content

Commit cddd629

Browse files
manisandromanisandro
committed
Make UBUNTU_RELEASE a build arg
1 parent 5bda3df commit cddd629

File tree

2 files changed

+28
-18
lines changed

2 files changed

+28
-18
lines changed

‎.github/workflows/qgis-server.yml‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Publish qwc-qgis-server docker images
22

3+
env:
4+
UBUNTU_RELEASE: noble
5+
36
on:
47
push:
58
workflow_dispatch:
@@ -15,27 +18,29 @@ jobs:
1518
- name: Get version tag QGIS 3 LTR
1619
id: get_tag_qgis_3_ltr
1720
run: |
18-
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu-ltr/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\(.*\)+.*/\1/')
19-
VERSION_MINOR=$(curl -Ls https://ubuntu.qgis.org/ubuntu-ltr/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\([0-9]*\.[0-9]*\).*/\1/')
21+
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu-ltr/dists/${{env.UBUNTU_RELEASE}}/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed -n 's/.*:\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')
22+
VERSION_MINOR=$(echo ${VERSION_TRIPLE} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
2023
echo "version=$VERSION_TRIPLE" >> $GITHUB_OUTPUT
2124
echo "minor=$VERSION_MINOR" >> $GITHUB_OUTPUT
2225
echo "tags=$VERSION_TRIPLE,$VERSION_MINOR,latest-ltr" >> $GITHUB_OUTPUT
2326
2427
- name: Build and publish docker image for QGIS Server 3 LTR
25-
uses: elgohr/Publish-Docker-Github-Action@v4
28+
uses: elgohr/Publish-Docker-Github-Action@v5
2629
env:
30+
UBUNTU_RELEASE: noble
2731
QGIS_REPO: ubuntu-ltr
2832
with:
2933
name: sourcepole/qwc-qgis-server
3034
username: ${{ secrets.DOCKER_HUB_USER }}
3135
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
3236
tags: "${{ steps.get_tag_qgis_3_ltr.outputs.tags }}"
3337
workdir: .
34-
buildargs: QGIS_REPO
38+
buildargs: UBUNTU_RELEASE,QGIS_REPO
3539

3640
- name: Build and publish docker image for QGIS Server 3 LTR with ODBC driver
37-
uses: elgohr/Publish-Docker-Github-Action@v4
41+
uses: elgohr/Publish-Docker-Github-Action@v5
3842
env:
43+
UBUNTU_RELEASE: noble
3944
QGIS_REPO: ubuntu-ltr
4045
with:
4146
name: sourcepole/qwc-qgis-server
@@ -44,41 +49,46 @@ jobs:
4449
tags: "${{ steps.get_tag_qgis_3_ltr.outputs.version }}-odbc,${{ steps.get_tag_qgis_3_ltr.outputs.minor }}-odbc"
4550
workdir: .
4651
dockerfile: Dockerfile-odbc
47-
buildargs: QGIS_REPO
52+
buildargs: UBUNTU_RELEASE,QGIS_REPO
4853

4954

5055
- name: Get version tag QGIS 3
5156
id: get_tag_qgis_3
5257
run: |
53-
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\(.*\)+.*/\1/')
54-
VERSION_MINOR=$(curl -Ls https://ubuntu.qgis.org/ubuntu/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\([0-9]*\.[0-9]*\).*/\1/')
58+
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu/dists/${{env.UBUNTU_RELEASE}}/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed -n 's/.*:\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')
59+
VERSION_MINOR=$(echo ${VERSION_TRIPLE} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
5560
echo "tags=$VERSION_TRIPLE,$VERSION_MINOR,latest" >> $GITHUB_OUTPUT
5661
5762
- name: Build and publish docker image for QGIS Server 3
58-
uses: elgohr/Publish-Docker-Github-Action@v4
63+
uses: elgohr/Publish-Docker-Github-Action@v5
64+
env:
65+
UBUNTU_RELEASE: noble
66+
QGIS_REPO: ubuntu
5967
with:
6068
name: sourcepole/qwc-qgis-server
6169
username: ${{ secrets.DOCKER_HUB_USER }}
6270
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
6371
tags: "${{ steps.get_tag_qgis_3.outputs.tags }}"
6472
workdir: .
73+
buildargs: UBUNTU_RELEASE,QGIS_REPO
6574

6675

6776
- name: Get version tag QGIS 3 release nightly
6877
id: get_tag_qgis_3_nightly
6978
run: |
70-
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu-nightly-release/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\(.*\)+.*/\1/')
71-
VERSION_MINOR=$(curl -Ls https://ubuntu.qgis.org/ubuntu-nightly-release/dists/noble/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed 's/^Version: 1:\([0-9]*\.[0-9]*\).*/\1/')
72-
echo "tags=$VERSION_TRIPLE,${VERSION_MINOR}-nightly,latest-nightly" >> $GITHUB_OUTPUT
79+
VERSION_TRIPLE=$(curl -Ls https://ubuntu.qgis.org/ubuntu-nightly-release/dists/${{env.UBUNTU_RELEASE}}/main/binary-amd64/Packages | grep -A 2 "Package: qgis-server$" | grep Version | head -1 | sed -n 's/.*:\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')
80+
VERSION_MINOR=$(echo ${VERSION_TRIPLE} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
81+
echo "tags=${VERSION_TRIPLE}-nightly,${VERSION_MINOR}-nightly,latest-nightly" >> $GITHUB_OUTPUT
7382
7483
- name: Build and publish docker image for QGIS Server 3 nightly
75-
uses: elgohr/Publish-Docker-Github-Action@v4
84+
uses: elgohr/Publish-Docker-Github-Action@v5
7685
env:
86+
UBUNTU_RELEASE: noble
7787
QGIS_REPO: ubuntu-nightly-release
7888
with:
7989
name: sourcepole/qwc-qgis-server
8090
username: ${{ secrets.DOCKER_HUB_USER }}
8191
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
8292
tags: "${{ steps.get_tag_qgis_3_nightly.outputs.tags }}"
8393
workdir: .
84-
buildargs: QGIS_REPO
94+
buildargs: UBUNTU_RELEASE,QGIS_REPO

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# QGIS Server 3 with Apache FCGI
22

3-
# NOTE: Also change Suites: noble below when changing!
4-
FROM ubuntu:noble
3+
ARG UBUNTU_RELEASE=noble
4+
FROM ubuntu:${UBUNTU_RELEASE}
55

66
ARG QGIS_REPO=ubuntu
77

@@ -22,7 +22,7 @@ RUN \
2222
echo "\
2323
Types: deb deb-src\n\
2424
URIs: https://qgis.org/$QGIS_REPO\n\
25-
Suites: noble\n\
25+
Suites: $UBUNTU_RELEASE\n\
2626
Architectures: amd64\n\
2727
Components: main\n\
2828
Signed-By: /etc/apt/keyrings/qgis-archive-keyring.gpg\n\
@@ -33,7 +33,7 @@ Signed-By: /etc/apt/keyrings/qgis-archive-keyring.gpg\n\
3333
rm -rf /var/lib/apt/lists/*
3434

3535
RUN locale-gen en_US.UTF-8 && update-locale
36-
ENV LOCALE en_US
36+
ENV LOCALE=en_US
3737

3838
# Configure apache
3939
RUN a2enmod rewrite && a2enmod cgi && a2enmod fcgid && a2enmod headers && \

0 commit comments

Comments
 (0)