From 762246c6ce6d0f580e7e2ec8e66bee9fbc347127 Mon Sep 17 00:00:00 2001 From: Michael Bryson Date: Tue, 7 Apr 2026 19:37:36 +0100 Subject: [PATCH 1/3] Updates --- .../src/main/docker/Dockerfile.aspnet | 2 +- .../src/main/docker/Dockerfile.runtime | 2 +- opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk | 2 +- .../pom.xml | 6 +++--- .../src/main/docker/Dockerfile | 2 +- pom.xml | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename {opensuse-nodejs20-image => opensuse-nodejs22-image}/pom.xml (95%) rename {opensuse-nodejs20-image => opensuse-nodejs22-image}/src/main/docker/Dockerfile (94%) diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet b/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet index 52b3e21..e76eeb3 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet @@ -18,7 +18,7 @@ ARG BASE_IMAGE FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/15/prod.repo && \ + curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ zypper -n install aspnetcore-runtime-10.0 && \ zypper -n clean --all diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime b/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime index 8d01b42..1122ec2 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime @@ -18,7 +18,7 @@ ARG BASE_IMAGE FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/15/prod.repo && \ + curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ zypper -n install dotnet-runtime-10.0 && \ zypper -n clean --all diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk b/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk index a31cd98..6a0da8c 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk @@ -18,7 +18,7 @@ ARG BASE_IMAGE FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/15/prod.repo && \ + curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ zypper -n install dotnet-sdk-10.0 && \ zypper -n clean --all diff --git a/opensuse-nodejs20-image/pom.xml b/opensuse-nodejs22-image/pom.xml similarity index 95% rename from opensuse-nodejs20-image/pom.xml rename to opensuse-nodejs22-image/pom.xml index 4144bb8..6926cca 100644 --- a/opensuse-nodejs20-image/pom.xml +++ b/opensuse-nodejs22-image/pom.xml @@ -27,10 +27,10 @@ 6.0.1-SNAPSHOT - opensuse-nodejs20-image + opensuse-nodejs22-image pom - openSUSE NodeJS20 image + openSUSE NodeJS22 image @@ -56,7 +56,7 @@ - ${dockerCafImagePrefix}opensuse-nodejs20${dockerProjectVersion} + ${dockerCafImagePrefix}opensuse-nodejs22${dockerProjectVersion} . diff --git a/opensuse-nodejs20-image/src/main/docker/Dockerfile b/opensuse-nodejs22-image/src/main/docker/Dockerfile similarity index 94% rename from opensuse-nodejs20-image/src/main/docker/Dockerfile rename to opensuse-nodejs22-image/src/main/docker/Dockerfile index 771d81f..bfb804f 100644 --- a/opensuse-nodejs20-image/src/main/docker/Dockerfile +++ b/opensuse-nodejs22-image/src/main/docker/Dockerfile @@ -18,5 +18,5 @@ ARG BASE_IMAGE FROM $BASE_IMAGE # Update the OS packages and install NodeJS -RUN zypper -n install nodejs20 npm && \ +RUN zypper -n install nodejs22 npm && \ zypper -n clean --all diff --git a/pom.xml b/pom.xml index 85c015c..472e6d7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,11 +60,11 @@ opensuse-base-image - opensuse-java8-images - opensuse-java11-images + + opensuse-java17-images opensuse-java21-images - opensuse-nodejs20-image + opensuse-nodejs22-image opensuse-dotnet10-images opensuse-python3-image @@ -103,7 +103,7 @@ ${dockerHubPublic}/opensuse/leap - latest + 16.0 From 5ac686bc0ce9b635a5cc0dda80138552ef66d3db Mon Sep 17 00:00:00 2001 From: Build Machine Date: Tue, 7 Apr 2026 18:08:20 +0000 Subject: [PATCH 2/3] Update POM versions to 7.0.0-SNAPSHOT --- opensuse-base-image/pom.xml | 2 +- opensuse-dotnet10-images/pom.xml | 2 +- opensuse-java17-images/pom.xml | 2 +- opensuse-java21-images/pom.xml | 2 +- opensuse-nodejs22-image/pom.xml | 2 +- opensuse-python3-image/pom.xml | 2 +- pom.xml | 2 +- release-notes-6.0.1.md => release-notes-7.0.0.md | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename release-notes-6.0.1.md => release-notes-7.0.0.md (100%) diff --git a/opensuse-base-image/pom.xml b/opensuse-base-image/pom.xml index b39983d..6555b04 100644 --- a/opensuse-base-image/pom.xml +++ b/opensuse-base-image/pom.xml @@ -24,7 +24,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-base-image diff --git a/opensuse-dotnet10-images/pom.xml b/opensuse-dotnet10-images/pom.xml index 72789e4..f605de9 100644 --- a/opensuse-dotnet10-images/pom.xml +++ b/opensuse-dotnet10-images/pom.xml @@ -23,7 +23,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-dotnet10-images diff --git a/opensuse-java17-images/pom.xml b/opensuse-java17-images/pom.xml index 38d8858..2afcbee 100644 --- a/opensuse-java17-images/pom.xml +++ b/opensuse-java17-images/pom.xml @@ -24,7 +24,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-java17-images diff --git a/opensuse-java21-images/pom.xml b/opensuse-java21-images/pom.xml index d4c1d0a..0dc8781 100644 --- a/opensuse-java21-images/pom.xml +++ b/opensuse-java21-images/pom.xml @@ -24,7 +24,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-java21-images diff --git a/opensuse-nodejs22-image/pom.xml b/opensuse-nodejs22-image/pom.xml index 6926cca..dac1697 100644 --- a/opensuse-nodejs22-image/pom.xml +++ b/opensuse-nodejs22-image/pom.xml @@ -24,7 +24,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-nodejs22-image diff --git a/opensuse-python3-image/pom.xml b/opensuse-python3-image/pom.xml index 627c2dc..66e5a5d 100644 --- a/opensuse-python3-image/pom.xml +++ b/opensuse-python3-image/pom.xml @@ -24,7 +24,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT opensuse-python3-image diff --git a/pom.xml b/pom.xml index 472e6d7..0e20816 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.github.cafapi opensuse-base-images-aggregator - 6.0.1-SNAPSHOT + 7.0.0-SNAPSHOT pom openSUSE Base Images Aggregator diff --git a/release-notes-6.0.1.md b/release-notes-7.0.0.md similarity index 100% rename from release-notes-6.0.1.md rename to release-notes-7.0.0.md From ca83895d4fe6a7a048cf6bdaad4d60e83ce59fd8 Mon Sep 17 00:00:00 2001 From: Michael Bryson Date: Wed, 8 Apr 2026 10:25:01 +0100 Subject: [PATCH 3/3] Added gpg-auto-import-keys for dotnet images --- opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet | 2 +- opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime | 2 +- opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet b/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet index e76eeb3..1838fda 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.aspnet @@ -20,5 +20,5 @@ FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ - zypper -n install aspnetcore-runtime-10.0 && \ + zypper -n --gpg-auto-import-keys install aspnetcore-runtime-10.0 && \ zypper -n clean --all diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime b/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime index 1122ec2..428570f 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.runtime @@ -20,5 +20,5 @@ FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ - zypper -n install dotnet-runtime-10.0 && \ + zypper -n --gpg-auto-import-keys install dotnet-runtime-10.0 && \ zypper -n clean --all diff --git a/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk b/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk index 6a0da8c..f090d37 100644 --- a/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk +++ b/opensuse-dotnet10-images/src/main/docker/Dockerfile.sdk @@ -20,5 +20,5 @@ FROM $BASE_IMAGE RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ curl -Lfo /etc/zypp/repos.d/microsoft-prod.repo https://packages.microsoft.com/config/opensuse/16/prod.repo && \ chown root:root /etc/zypp/repos.d/microsoft-prod.repo && \ - zypper -n install dotnet-sdk-10.0 && \ + zypper -n --gpg-auto-import-keys install dotnet-sdk-10.0 && \ zypper -n clean --all