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

🤖: Update build recipes for SP7
SUSE · Sep 17, 2024 · 05cb82f · 05cb82f
2 parents 85b5f0e + f16d654
commit 05cb82f
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 194 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -9,10 +9,6 @@ staging_build:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
         source_package: alertmanager-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
-    - branch_package:
-        source_project: home:defolos:BCI:CR:SLE-15-SP7
-        source_package: sac-apache-tomcat-10-java21-image
-        target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
         source_package: blackbox_exporter-image
@@ -208,9 +204,6 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
         package: alertmanager-image
-    - trigger_services:
-        project: devel:BCI:SLE-15-SP7
-        package: sac-apache-tomcat-10-java21-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
         package: blackbox_exporter-image

diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI ASP.NET Core Runtime 6.0"
 LABEL org.opencontainers.image.description="The ASP.NET Core Runtime 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="6.0"
+LABEL org.opencontainers.image.version="6.0.33"
 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/aspnet-runtime-6.0/aspnet-runtime-6.0.changes b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI ASP.NET Core Runtime 8.0"
 LABEL org.opencontainers.image.description="The ASP.NET Core Runtime 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="8.0"
+LABEL org.opencontainers.image.version="8.0.8"
 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/aspnet-runtime-8.0/aspnet-runtime-8.0.changes b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI .NET SDK 6.0"
 LABEL org.opencontainers.image.description="The .NET SDK 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="6.0"
+LABEL org.opencontainers.image.version="6.0.33"
 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/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI .NET SDK 8.0"
 LABEL org.opencontainers.image.description="The .NET SDK 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="8.0"
+LABEL org.opencontainers.image.version="8.0.8"
 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/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI .NET Runtime 6.0"
 LABEL org.opencontainers.image.description="The .NET Runtime 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="6.0"
+LABEL org.opencontainers.image.version="6.0.33"
 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/dotnet-runtime-6.0/dotnet-runtime-6.0.changes b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -30,7 +30,7 @@ FROM bci/bci-base:15.7
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI .NET Runtime 8.0"
 LABEL org.opencontainers.image.description="The .NET Runtime 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
-LABEL org.opencontainers.image.version="8.0"
+LABEL org.opencontainers.image.version="8.0.8"
 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/dotnet-runtime-8.0/dotnet-runtime-8.0.changes b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Set the full .Net version for the org.opencontainers.image.version label
+
 -------------------------------------------------------------------
 Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/sac-apache-tomcat-10-java21-image/Dockerfile b/sac-apache-tomcat-10-java21-image/Dockerfile
diff --git a/sac-apache-tomcat-10-java21-image/README.md b/sac-apache-tomcat-10-java21-image/README.md
diff --git a/sac-apache-tomcat-10-java21-image/_service b/sac-apache-tomcat-10-java21-image/_service
diff --git a/sac-apache-tomcat-10-java21-image/sac-apache-tomcat-10-java21-image.changes b/sac-apache-tomcat-10-java21-image/sac-apache-tomcat-10-java21-image.changes
diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile
@@ -25,7 +25,6 @@ RUN set -euo pipefail; zypper -n in --no-recommends ca-certificates-mozilla cyru
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.postfix
-LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="Postfix"
 LABEL org.opencontainers.image.description="Postfix container is fast and secure mail server, based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="%%postfix_version%%"

diff --git a/sac-postfix-image/sac-postfix-image.changes b/sac-postfix-image/sac-postfix-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 17 06:37:18 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Remove author label
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller <[email protected]>