Dockerfile

@@ -13,33 +13,31 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
-#!UseOBSRepositories
 
-#!BuildTag: opensuse/bci/rust:stable-1.%RELEASE%
 #!BuildTag: opensuse/bci/rust:stable
-#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-1.%RELEASE%
+#!BuildTag: opensuse/bci/rust:stable-1.%RELEASE%
+#!BuildTag: opensuse/bci/rust:1.80
+#!BuildTag: opensuse/bci/rust:1.80-1.%RELEASE%
 #!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%
-#!BuildTag: opensuse/bci/rust:1.82
+#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-1.%RELEASE%
 #!BuildTag: opensuse/bci/rust:latest
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; \
+RUN set -euo pipefail; zypper -n in --no-recommends rust1.80 cargo1.80; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
-    zypper -n install --no-recommends rust1.82 cargo1.82; \
-    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=org.opensuse.bci.rust
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.82"
+LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
-LABEL org.opencontainers.image.description="Rust 1.82 container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.80"
+LABEL org.opencontainers.image.description="Rust 1.80 container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="1.80-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:%%RUST_VERSION%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/rust:1.80-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

README.md

@@ -1,4 +1,4 @@
-# Rust 1.82 Container Image
+# Rust 1.80 Container Image
 
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
 
@@ -11,8 +11,8 @@
 To compile and deploy an application, copy the sources, fetch dependencies, and build the binary:
 
 ```Dockerfile
-# Build the application using the Rust 1.82 container image
+# Build the application using the Rust 1.80 container image
-FROM registry.opensuse.org/opensuse/bci/rust:1.82 as build
+FROM registry.opensuse.org/opensuse/bci/rust:1.80 as build
 
 WORKDIR /app
 
@@ -21,7 +21,7 @@ COPY . ./
 RUN cargo build --release
 
 # Bundle the application into a BCI micro (or other BCI image)
-FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
+FROM registry.suse.com/bci/bci-micro:latest
 
 COPY --from=build /app/target/release/hello /usr/local/bin/hello
 
@@ -40,7 +40,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.opensuse.org/opensuse/bci/rust:1.82 cargo build --release
+$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/rust:1.80 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`.

_service

@@ -1,14 +1,14 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
-    <param name="package">rust1.82</param>
+    <param name="package">rust1.80</param>
   </service>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
-    <param name="package">cargo1.82</param>
+    <param name="package">cargo1.80</param>
   </service>
 </services>

rust-and-cargo-pin.check

@@ -1,2 +1,2 @@
-requires:cargo1.82
+requires:cargo1.80
-requires:rust1.82
+requires:rust1.80

rust-stable-image.changes

@@ -1,63 +1,3 @@
--------------------------------------------------------------------
-Tue Dec  3 13:26:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Change attribute order in _service
-
--------------------------------------------------------------------
-Mon Nov  4 13:48:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Bump Rust version to 1.82
-
--------------------------------------------------------------------
-Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-
--------------------------------------------------------------------
-Tue Oct 29 15:23:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- drop tag_version-%RELEASE%
-
--------------------------------------------------------------------
-Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
-
--------------------------------------------------------------------
-Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the tag with -%RELEASE% the first tag listed
-
--------------------------------------------------------------------
-Sat Sep 28 08:15:08 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- fix registry references in READMEs
-
--------------------------------------------------------------------
-Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rerender installation step in multiple lines, allow uninstalling optional packages
-
--------------------------------------------------------------------
-Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- improved log cleaning
-
--------------------------------------------------------------------
-Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- remove release tags for additional_versions
-
--------------------------------------------------------------------
-Tue Sep 24 13:14:58 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rust 1.81 for stable, rust 1.80 for oldstable
-
--------------------------------------------------------------------
-Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set useobsrepositories explicitly
-
 -------------------------------------------------------------------
 Fri Sep  6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>