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

🤖: Update build recipes for SP7
SUSE · Nov 7, 2024 · 76eb327 · 76eb327
2 parents 591356d + 97385b1
commit 76eb327
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 36 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -55,19 +55,19 @@ staging_build:
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
-        source_package: golang-oldstable-openssl-image
+        source_package: golang-oldstable-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
-        source_package: golang-stable-openssl-image
+        source_package: golang-oldstable-openssl-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
-        source_package: golang-oldstable-image
+        source_package: golang-stable-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
-        source_package: golang-stable-image
+        source_package: golang-stable-openssl-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
@@ -243,16 +243,16 @@ refresh_devel_BCI:
         package: git-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
-        package: golang-oldstable-openssl-image
+        package: golang-oldstable-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
-        package: golang-stable-openssl-image
+        package: golang-oldstable-openssl-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
-        package: golang-oldstable-image
+        package: golang-stable-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
-        package: golang-stable-image
+        package: golang-stable-openssl-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
         package: grafana-image

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -19,21 +19,21 @@
 #!BuildTag: bci/golang:oldstable-openssl
 #!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%-openssl
-#!BuildTag: bci/golang:1.20-openssl
+#!BuildTag: bci/golang:1.22-openssl
 #!BuildName: bci-golang-oldstable-openssl
 #!BuildVersion: 15.7
 FROM bci/bci-base:15.7
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends go1.20-openssl go1.20-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
+    zypper -n install --no-recommends go1.22-openssl go1.22-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
-LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
-LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.22-openssl development"
+LABEL org.opencontainers.image.description="Go 1.22-openssl development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
@@ -56,7 +56,7 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 
 # only available on go's tsan_arch architectures
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
-RUN set -euo pipefail; if zypper -n install go1.20-openssl-race; then zypper -n clean; fi
+RUN set -euo pipefail; if zypper -n install go1.22-openssl-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
 RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go

diff --git a/golang-oldstable-openssl-image/README.md b/golang-oldstable-openssl-image/README.md
@@ -1,4 +1,4 @@
-# Go 1.20-openssl development container image
+# Go 1.22-openssl development 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)
@@ -41,8 +41,8 @@ the following Dockerfile options.
 ### Building from `scratch`
 
 ```Dockerfile
-# Build the application using the Go 1.20-openssl development container image
-FROM registry.suse.com/bci/golang:1.20-openssl as build
+# Build the application using the Go 1.22-openssl development container image
+FROM registry.suse.com/bci/golang:1.22-openssl as build
 
 WORKDIR /app
 
@@ -80,13 +80,13 @@ There are situations when you don't want to run an application inside a containe
 To compile the application, without running it inside a container instance, use the following command:
 
 ```ShellSession
-$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.20-openssl go build -v
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.22-openssl go build -v
 ```
 
 To run the application tests inside a container, use the following command:
 
 ```ShellSession
-$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.20-openssl go test -v
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.22-openssl go test -v
 ```
 
 
@@ -96,8 +96,8 @@ The [SLE BCI General Purpose Base Containers](https://opensource.suse.com/bci-do
 images offer four different options for deployment, depending on your exact requirements.
 
 ```Dockerfile
-# Build the application using the Go 1.20-openssl development Container Image
-FROM registry.suse.com/bci/golang:1.20-openssl as build
+# Build the application using the Go 1.22-openssl development Container Image
+FROM registry.suse.com/bci/golang:1.22-openssl as build
 
 WORKDIR /app
 
@@ -138,7 +138,7 @@ import _ "crypto/tls/fipsonly"
 In addition to the standard SLE BCI development packages, the following tools
 are included in the image:
 
-- go1.20-openssl-race
+- go1.22-openssl-race
 - make
 
 ## Licensing

diff --git a/golang-oldstable-openssl-image/_service b/golang-oldstable-openssl-image/_service
@@ -4,6 +4,6 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
-    <param name="package">go1.20-openssl</param>
+    <param name="package">go1.22-openssl</param>
   </service>
 </services>
diff --git a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  7 14:16:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- oldstable updated to 1.22; stable is now 1.23
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -19,21 +19,21 @@
 #!BuildTag: bci/golang:stable-openssl
 #!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%-openssl
-#!BuildTag: bci/golang:1.21-openssl
+#!BuildTag: bci/golang:1.23-openssl
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.7
 FROM bci/bci-base:15.7
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends go1.21-openssl go1.21-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
+    zypper -n install --no-recommends go1.23-openssl go1.23-openssl-doc make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
-LABEL org.opencontainers.image.title="SLE BCI Go 1.21-openssl development"
-LABEL org.opencontainers.image.description="Go 1.21-openssl development container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.23-openssl development"
+LABEL org.opencontainers.image.description="Go 1.23-openssl development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
@@ -56,7 +56,7 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 
 # only available on go's tsan_arch architectures
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
-RUN set -euo pipefail; if zypper -n install go1.21-openssl-race; then zypper -n clean; fi
+RUN set -euo pipefail; if zypper -n install go1.23-openssl-race; then zypper -n clean; fi
 RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
 RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 WORKDIR /go

diff --git a/golang-stable-openssl-image/README.md b/golang-stable-openssl-image/README.md
@@ -1,4 +1,4 @@
-# Go 1.21-openssl development container image
+# Go 1.23-openssl development 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)
@@ -41,8 +41,8 @@ the following Dockerfile options.
 ### Building from `scratch`
 
 ```Dockerfile
-# Build the application using the Go 1.21-openssl development container image
-FROM registry.suse.com/bci/golang:1.21-openssl as build
+# Build the application using the Go 1.23-openssl development container image
+FROM registry.suse.com/bci/golang:1.23-openssl as build
 
 WORKDIR /app
 
@@ -80,13 +80,13 @@ There are situations when you don't want to run an application inside a containe
 To compile the application, without running it inside a container instance, use the following command:
 
 ```ShellSession
-$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.21-openssl go build -v
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.23-openssl go build -v
 ```
 
 To run the application tests inside a container, use the following command:
 
 ```ShellSession
-$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.21-openssl go test -v
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/golang:1.23-openssl go test -v
 ```
 
 
@@ -96,8 +96,8 @@ The [SLE BCI General Purpose Base Containers](https://opensource.suse.com/bci-do
 images offer four different options for deployment, depending on your exact requirements.
 
 ```Dockerfile
-# Build the application using the Go 1.21-openssl development Container Image
-FROM registry.suse.com/bci/golang:1.21-openssl as build
+# Build the application using the Go 1.23-openssl development Container Image
+FROM registry.suse.com/bci/golang:1.23-openssl as build
 
 WORKDIR /app
 
@@ -138,7 +138,7 @@ import _ "crypto/tls/fipsonly"
 In addition to the standard SLE BCI development packages, the following tools
 are included in the image:
 
-- go1.21-openssl-race
+- go1.23-openssl-race
 - make
 
 ## Licensing

diff --git a/golang-stable-openssl-image/_service b/golang-stable-openssl-image/_service
@@ -4,6 +4,6 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
-    <param name="package">go1.21-openssl</param>
+    <param name="package">go1.23-openssl</param>
   </service>
 </services>
diff --git a/golang-stable-openssl-image/golang-stable-openssl-image.changes b/golang-stable-openssl-image/golang-stable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  7 14:16:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- oldstable updated to 1.22; stable is now 1.23
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>