Skip to content

Commit b5adacb

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

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

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

Lines changed: 20 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,14 +18,14 @@ 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:
2730
QGIS_REPO: ubuntu-ltr
2831
with:
@@ -31,10 +34,10 @@ jobs:
3134
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
3235
tags: "${{ steps.get_tag_qgis_3_ltr.outputs.tags }}"
3336
workdir: .
34-
buildargs: QGIS_REPO
37+
buildargs: UBUNTU_RELEASE,QGIS_REPO
3538

3639
- name: Build and publish docker image for QGIS Server 3 LTR with ODBC driver
37-
uses: elgohr/Publish-Docker-Github-Action@v4
40+
uses: elgohr/Publish-Docker-Github-Action@v5
3841
env:
3942
QGIS_REPO: ubuntu-ltr
4043
with:
@@ -44,35 +47,38 @@ jobs:
4447
tags: "${{ steps.get_tag_qgis_3_ltr.outputs.version }}-odbc,${{ steps.get_tag_qgis_3_ltr.outputs.minor }}-odbc"
4548
workdir: .
4649
dockerfile: Dockerfile-odbc
47-
buildargs: QGIS_REPO
50+
buildargs: UBUNTU_RELEASE,QGIS_REPO
4851

4952

5053
- name: Get version tag QGIS 3
5154
id: get_tag_qgis_3
5255
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/')
56+
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')
57+
VERSION_MINOR=$(echo ${VERSION_TRIPLE} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
5558
echo "tags=$VERSION_TRIPLE,$VERSION_MINOR,latest" >> $GITHUB_OUTPUT
5659
5760
- name: Build and publish docker image for QGIS Server 3
58-
uses: elgohr/Publish-Docker-Github-Action@v4
61+
uses: elgohr/Publish-Docker-Github-Action@v5
62+
env:
63+
QGIS_REPO: ubuntu
5964
with:
6065
name: sourcepole/qwc-qgis-server
6166
username: ${{ secrets.DOCKER_HUB_USER }}
6267
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
6368
tags: "${{ steps.get_tag_qgis_3.outputs.tags }}"
6469
workdir: .
70+
buildargs: UBUNTU_RELEASE,QGIS_REPO
6571

6672

6773
- name: Get version tag QGIS 3 release nightly
6874
id: get_tag_qgis_3_nightly
6975
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
76+
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')
77+
VERSION_MINOR=$(echo ${VERSION_TRIPLE} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
78+
echo "tags=${VERSION_TRIPLE}-nightly,${VERSION_MINOR}-nightly,latest-nightly" >> $GITHUB_OUTPUT
7379
7480
- name: Build and publish docker image for QGIS Server 3 nightly
75-
uses: elgohr/Publish-Docker-Github-Action@v4
81+
uses: elgohr/Publish-Docker-Github-Action@v5
7682
env:
7783
QGIS_REPO: ubuntu-nightly-release
7884
with:
@@ -81,4 +87,4 @@ jobs:
8187
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
8288
tags: "${{ steps.get_tag_qgis_3_nightly.outputs.tags }}"
8389
workdir: .
84-
buildargs: QGIS_REPO
90+
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)