Merge pull request #2337 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Mar 7, 2025 · 31c171a · 31c171a
2 parents d9a9ad4 + 5881825
commit 31c171a
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 28 deletions.
diff --git a/postgres-16-image/docker-entrypoint.sh b/postgres-16-image/docker-entrypoint.sh
@@ -269,6 +269,9 @@ docker_temp_server_start() {
 	# does not listen on external TCP/IP and waits until start finishes
 	set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}"
 
+	# unset NOTIFY_SOCKET so the temporary server doesn't prematurely notify
+	# any process supervisor.
+	NOTIFY_SOCKET= \
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
 		-o "$(printf '%q ' "$@")" \

diff --git a/postgres-16-image/postgres-16-image.changes b/postgres-16-image/postgres-16-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 07:09:41 UTC 2025 - SUSE Update Bot <[email protected]>
+
+- Unset NOTIFY_SOCKET in entrypoint
+
 -------------------------------------------------------------------
 Fri Feb 14 18:03:06 UTC 2025 - SUSE Update Bot <[email protected]>
 

diff --git a/postgres-17-image/docker-entrypoint.sh b/postgres-17-image/docker-entrypoint.sh
@@ -269,6 +269,9 @@ docker_temp_server_start() {
 	# does not listen on external TCP/IP and waits until start finishes
 	set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}"
 
+	# unset NOTIFY_SOCKET so the temporary server doesn't prematurely notify
+	# any process supervisor.
+	NOTIFY_SOCKET= \
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
 		-o "$(printf '%q ' "$@")" \

diff --git a/postgres-17-image/postgres-17-image.changes b/postgres-17-image/postgres-17-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 07:09:41 UTC 2025 - SUSE Update Bot <[email protected]>
+
+- Unset NOTIFY_SOCKET in entrypoint
+
 -------------------------------------------------------------------
 Fri Feb 14 18:03:06 UTC 2025 - SUSE Update Bot <[email protected]>
 

diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile
@@ -19,21 +19,21 @@
 #!BuildTag: bci/rust:oldstable
 #!BuildTag: bci/rust:%%RUST_VERSION%%-2.%RELEASE%
 #!BuildTag: bci/rust:%%RUST_VERSION%%
-#!BuildTag: bci/rust:1.83
+#!BuildTag: bci/rust:1.84
 #!BuildName: bci-rust-oldstable
-#!BuildVersion: 15.6.1.83.2
+#!BuildVersion: 15.6.1.84.2
 FROM registry.suse.com/bci/bci-base:15.6
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends rust1.83 cargo1.83 lifecycle-data-sle-module-development-tools; \
+    zypper -n install --no-recommends rust1.84 cargo1.84 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.rust
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
-LABEL org.opencontainers.image.title="SLE BCI Rust 1.83"
-LABEL org.opencontainers.image.description="Rust 1.83 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Rust 1.84"
+LABEL org.opencontainers.image.description="Rust 1.84 container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
@@ -43,7 +43,7 @@ LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-2.%RELEASE%"
 LABEL org.opensuse.reference="registry.suse.com/bci/rust:%%RUST_VERSION%%-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
-LABEL com.suse.supportlevel.until="2025-03-13"
+LABEL com.suse.supportlevel.until="2025-04-24"
 LABEL com.suse.eula="sle-bci"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="released"

diff --git a/rust-oldstable-image/README.md b/rust-oldstable-image/README.md
@@ -1,4 +1,4 @@
-# Rust 1.83 Container Image
+# Rust 1.84 Container Image
 
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)[![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)
@@ -12,8 +12,8 @@
 To compile and deploy an application, copy the sources, fetch dependencies, and build the binary:
 
 ```Dockerfile
-# Build the application using the Rust 1.83 container image
-FROM registry.suse.com/bci/rust:1.83 as build
+# Build the application using the Rust 1.84 container image
+FROM registry.suse.com/bci/rust:1.84 as build
 
 WORKDIR /app
 
@@ -41,7 +41,7 @@ There are situations, where you don't want to run an application inside a contai
 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/rust:1.83 cargo build --release
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.84 cargo build --release
 ```
 
 **Note:** The Rust image is intended to be used as a build environment. For runtime, use smaller images such as `bci-base`, `bci-micro`, or `bci-minimal`.

diff --git a/rust-oldstable-image/_service b/rust-oldstable-image/_service
@@ -4,11 +4,11 @@
   <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
-    <param name="package">rust1.83</param>
+    <param name="package">rust1.84</param>
   </service>
   <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
-    <param name="package">cargo1.83</param>
+    <param name="package">cargo1.84</param>
   </service>
 </services>
diff --git a/rust-oldstable-image/rust-and-cargo-pin.check b/rust-oldstable-image/rust-and-cargo-pin.check
@@ -1,2 +1,2 @@
-requires:cargo1.83
-requires:rust1.83
+requires:cargo1.84
+requires:rust1.84
diff --git a/rust-oldstable-image/rust-oldstable-image.changes b/rust-oldstable-image/rust-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 07:09:37 UTC 2025 - SUSE Update Bot <[email protected]>
+
+- Switch to Rust 1.84
+
 -------------------------------------------------------------------
 Wed Feb 12 17:46:56 UTC 2025 - SUSE Update Bot <[email protected]>
 

diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
@@ -19,22 +19,22 @@
 #!BuildTag: bci/rust:stable
 #!BuildTag: bci/rust:%%RUST_VERSION%%-1.%RELEASE%
 #!BuildTag: bci/rust:%%RUST_VERSION%%
-#!BuildTag: bci/rust:1.84
+#!BuildTag: bci/rust:1.85
 #!BuildTag: bci/rust:latest
 #!BuildName: bci-rust-stable
-#!BuildVersion: 15.6.1.84.1
+#!BuildVersion: 15.6.1.85.1
 FROM registry.suse.com/bci/bci-base:15.6
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends rust1.84 cargo1.84 lifecycle-data-sle-module-development-tools; \
+    zypper -n install --no-recommends rust1.85 cargo1.85 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.rust
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
-LABEL org.opencontainers.image.title="SLE BCI Rust 1.84"
-LABEL org.opencontainers.image.description="Rust 1.84 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Rust 1.85"
+LABEL org.opencontainers.image.description="Rust 1.85 container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
@@ -44,7 +44,7 @@ LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-1.%RELEASE%"
 LABEL org.opensuse.reference="registry.suse.com/bci/rust:%%RUST_VERSION%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
-LABEL com.suse.supportlevel.until="2025-04-24"
+LABEL com.suse.supportlevel.until="2025-06-05"
 LABEL com.suse.eula="sle-bci"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="released"

diff --git a/rust-stable-image/README.md b/rust-stable-image/README.md
@@ -1,4 +1,4 @@
-# Rust 1.84 Container Image
+# Rust 1.85 Container Image
 
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)[![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)
@@ -12,8 +12,8 @@
 To compile and deploy an application, copy the sources, fetch dependencies, and build the binary:
 
 ```Dockerfile
-# Build the application using the Rust 1.84 container image
-FROM registry.suse.com/bci/rust:1.84 as build
+# Build the application using the Rust 1.85 container image
+FROM registry.suse.com/bci/rust:1.85 as build
 
 WORKDIR /app
 
@@ -41,7 +41,7 @@ There are situations, where you don't want to run an application inside a contai
 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/rust:1.84 cargo build --release
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.85 cargo build --release
 ```
 
 **Note:** The Rust image is intended to be used as a build environment. For runtime, use smaller images such as `bci-base`, `bci-micro`, or `bci-minimal`.

diff --git a/rust-stable-image/_service b/rust-stable-image/_service
@@ -4,11 +4,11 @@
   <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
-    <param name="package">rust1.84</param>
+    <param name="package">rust1.85</param>
   </service>
   <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
-    <param name="package">cargo1.84</param>
+    <param name="package">cargo1.85</param>
   </service>
 </services>
diff --git a/rust-stable-image/rust-and-cargo-pin.check b/rust-stable-image/rust-and-cargo-pin.check
@@ -1,2 +1,2 @@
-requires:cargo1.84
-requires:rust1.84
+requires:cargo1.85
+requires:rust1.85
diff --git a/rust-stable-image/rust-stable-image.changes b/rust-stable-image/rust-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 07:09:36 UTC 2025 - SUSE Update Bot <[email protected]>
+
+- Switch to Rust 1.85
+
 -------------------------------------------------------------------
 Wed Feb 12 17:46:56 UTC 2025 - SUSE Update Bot <[email protected]>