Merge pull request #834 from SUSE/for-deploy-5

🤖: Update build recipes for SP5
SUSE · Jan 11, 2024 · 52986e7 · 52986e7
2 parents 620f762 + 720b0b7
commit 52986e7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile
@@ -16,33 +16,33 @@
 
 #!BuildTag: bci/rust:oldstable
 #!BuildTag: bci/rust:oldstable-2.%RELEASE%
-#!BuildTag: bci/rust:1.73
-#!BuildTag: bci/rust:1.73-2.%RELEASE%
+#!BuildTag: bci/rust:1.74
+#!BuildTag: bci/rust:1.74-2.%RELEASE%
 #!BuildName: bci-rust-oldstable
-#!BuildVersion: 15.5.1.73.2
+#!BuildVersion: 15.5.1.74.2
 FROM suse/sle15:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.rust
-LABEL org.opencontainers.image.title="SLE BCI Rust 1.73"
-LABEL org.opencontainers.image.description="Rust 1.73 container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.73"
+LABEL org.opencontainers.image.title="SLE BCI Rust 1.74"
+LABEL org.opencontainers.image.description="Rust 1.74 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.74"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.73-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.74-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
-LABEL com.suse.supportlevel.until="2024-01-04"
+LABEL com.suse.supportlevel.until="2024-02-29"
 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"
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends rust1.73 cargo1.73 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends rust1.74 cargo1.74 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
 ENV RUST_VERSION="%%RUST_VERSION%%"
 ENV CARGO_VERSION="%%CARGO_VERSION%%"
 ENV CC="/usr/local/bin/gcc"

diff --git a/rust-oldstable-image/_service b/rust-oldstable-image/_service
@@ -4,11 +4,11 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
-    <param name="package">rust1.73</param>
+    <param name="package">rust1.74</param>
   </service>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
-    <param name="package">cargo1.73</param>
+    <param name="package">cargo1.74</param>
   </service>
 </services>
diff --git a/rust-oldstable-image/rust-oldstable-image.changes b/rust-oldstable-image/rust-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 09:05:16 UTC 2024 - Dirk Mueller <[email protected]>
+
+- move stable to 1.75, oldstable to 1.74
+
 -------------------------------------------------------------------
 Tue Jan  9 16:47:51 UTC 2024 - Dan Čermák <[email protected]>
 

diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
@@ -16,34 +16,34 @@
 
 #!BuildTag: bci/rust:stable
 #!BuildTag: bci/rust:stable-1.%RELEASE%
-#!BuildTag: bci/rust:1.74
-#!BuildTag: bci/rust:1.74-1.%RELEASE%
+#!BuildTag: bci/rust:1.75
+#!BuildTag: bci/rust:1.75-1.%RELEASE%
 #!BuildTag: bci/rust:latest
 #!BuildName: bci-rust-stable
-#!BuildVersion: 15.5.1.74.1
+#!BuildVersion: 15.5.1.75.1
 FROM suse/sle15:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.rust
-LABEL org.opencontainers.image.title="SLE BCI Rust 1.74"
-LABEL org.opencontainers.image.description="Rust 1.74 container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.74"
+LABEL org.opencontainers.image.title="SLE BCI Rust 1.75"
+LABEL org.opencontainers.image.description="Rust 1.75 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.75"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.74-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.75-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
-LABEL com.suse.supportlevel.until="2024-02-15"
+LABEL com.suse.supportlevel.until="2024-04-11"
 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"
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends rust1.74 cargo1.74 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends rust1.75 cargo1.75 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
 ENV RUST_VERSION="%%RUST_VERSION%%"
 ENV CARGO_VERSION="%%CARGO_VERSION%%"
 ENV CC="/usr/local/bin/gcc"

diff --git a/rust-stable-image/_service b/rust-stable-image/_service
@@ -4,11 +4,11 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
-    <param name="package">rust1.74</param>
+    <param name="package">rust1.75</param>
   </service>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
-    <param name="package">cargo1.74</param>
+    <param name="package">cargo1.75</param>
   </service>
 </services>
diff --git a/rust-stable-image/rust-stable-image.changes b/rust-stable-image/rust-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 09:05:16 UTC 2024 - Dirk Mueller <[email protected]>
+
+- move stable to 1.75, oldstable to 1.74
+
 -------------------------------------------------------------------
 Tue Jan  9 16:47:51 UTC 2024 - Dan Čermák <[email protected]>