Merge pull request #1676 from SUSE/for-deploy-7

🤖: Update build recipes for SP7
SUSE · Sep 16, 2024 · 85b5f0e · 85b5f0e
2 parents fbeb91d + 4b2fbbd
commit 85b5f0e
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 8 deletions.
diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -62,7 +62,7 @@ COPY aspnetcore-runtime-6.0-6.0.33-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/aspnet-runtime-6.0/aspnet-runtime-6.0.changes b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -62,7 +62,7 @@ COPY aspnetcore-runtime-8.0-8.0.8-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/aspnet-runtime-8.0/aspnet-runtime-8.0.changes b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -73,7 +73,7 @@ COPY dotnet-sdk-6.0-6.0.425-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -73,7 +73,7 @@ COPY dotnet-sdk-8.0-8.0.401-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -60,7 +60,7 @@ COPY dotnet-runtime-6.0-6.0.33-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/dotnet-runtime-6.0/dotnet-runtime-6.0.changes b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -60,7 +60,7 @@ COPY dotnet-runtime-8.0-8.0.8-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp

diff --git a/dotnet-runtime-8.0/dotnet-runtime-8.0.changes b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
+
+- install coreutils to avoid ambiguity with busybox-coreutils
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/spack-image/Dockerfile b/spack-image/Dockerfile
@@ -30,7 +30,7 @@ RUN set -euo pipefail; zypper -n in spack bison cmake-full flex libtool makeinfo
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI Spack development"
 LABEL org.opencontainers.image.description="Spack development container for building containerized HPC solution stacks, based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="0.21"
+LABEL org.opencontainers.image.version="0.21.2"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"

diff --git a/spack-image/README.md b/spack-image/README.md
@@ -1,4 +1,4 @@
-# Spack 0.21 container image
+# Spack 0.21.2 container image
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)![Support Level](https://img.shields.io/badge/Support_Level-techpreview-blue)[![SLSA](https://img.shields.io/badge/SLSA_(v1.0)-Build_L3-Green)](https://documentation.suse.com/sbp/server-linux/html/SBP-SLSA4/)
 [![Provenance: Available](https://img.shields.io/badge/Provenance-Available-Green)](https://documentation.suse.com/container/all/html/Container-guide/index.html#container-verify)
 

diff --git a/spack-image/spack-image.changes b/spack-image/spack-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 16 08:17:40 UTC 2024 - Dirk Mueller <[email protected]>
+
+- use full version
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>