Skip to content

Commit

Permalink
Test build for #2146
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Dec 19, 2024
1 parent 766d3ed commit e2b6a57
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions rust-oldstable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
#!BuildTag: bci/rust:oldstable
#!BuildTag: bci/rust:%%RUST_VERSION%%-2.%RELEASE%
#!BuildTag: bci/rust:%%RUST_VERSION%%
#!BuildTag: bci/rust:1.81
#!BuildTag: bci/rust:1.82
#!BuildName: bci-rust-oldstable
#!BuildVersion: 15.6.1.81.2
#!BuildVersion: 15.6.1.82.2
FROM registry.suse.com/bci/bci-base:15.6

RUN set -euo pipefail; \
zypper -n install --no-recommends rust1.81 cargo1.81 lifecycle-data-sle-module-development-tools; \
zypper -n install --no-recommends rust1.82 cargo1.82 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.81"
LABEL org.opencontainers.image.description="Rust 1.81 container based on the SLE Base Container Image."
LABEL org.opencontainers.image.title="SLE BCI Rust 1.82"
LABEL org.opencontainers.image.description="Rust 1.82 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%"
Expand All @@ -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="2024-12-19"
LABEL com.suse.supportlevel.until="2025-01-30"
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"
Expand Down
8 changes: 4 additions & 4 deletions rust-oldstable-image/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Rust 1.81 Container Image
# Rust 1.82 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)
Expand All @@ -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.81 container image
FROM registry.suse.com/bci/rust:1.81 as build
# Build the application using the Rust 1.82 container image
FROM registry.suse.com/bci/rust:1.82 as build

WORKDIR /app

Expand Down Expand Up @@ -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.81 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.82 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`.
Expand Down
4 changes: 2 additions & 2 deletions rust-oldstable-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -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.81</param>
<param name="package">rust1.82</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.81</param>
<param name="package">cargo1.82</param>
</service>
</services>
4 changes: 2 additions & 2 deletions rust-oldstable-image/rust-and-cargo-pin.check
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
requires:cargo1.81
requires:rust1.81
requires:cargo1.82
requires:rust1.82
12 changes: 6 additions & 6 deletions rust-stable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
#!BuildTag: bci/rust:stable
#!BuildTag: bci/rust:%%RUST_VERSION%%-1.%RELEASE%
#!BuildTag: bci/rust:%%RUST_VERSION%%
#!BuildTag: bci/rust:1.82
#!BuildTag: bci/rust:1.83
#!BuildTag: bci/rust:latest
#!BuildName: bci-rust-stable
#!BuildVersion: 15.6.1.82.1
#!BuildVersion: 15.6.1.83.1
FROM registry.suse.com/bci/bci-base:15.6

RUN set -euo pipefail; \
zypper -n install --no-recommends rust1.82 cargo1.82 lifecycle-data-sle-module-development-tools; \
zypper -n install --no-recommends rust1.83 cargo1.83 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.82"
LABEL org.opencontainers.image.description="Rust 1.82 container based on the SLE Base Container Image."
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.version="%%RUST_VERSION%%"
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
Expand All @@ -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-01-30"
LABEL com.suse.supportlevel.until="2025-03-13"
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"
Expand Down
8 changes: 4 additions & 4 deletions rust-stable-image/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Rust 1.82 Container Image
# Rust 1.83 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)
Expand All @@ -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.82 container image
FROM registry.suse.com/bci/rust:1.82 as build
# Build the application using the Rust 1.83 container image
FROM registry.suse.com/bci/rust:1.83 as build

WORKDIR /app

Expand Down Expand Up @@ -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.82 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.83 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`.
Expand Down
4 changes: 2 additions & 2 deletions rust-stable-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -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.82</param>
<param name="package">rust1.83</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.82</param>
<param name="package">cargo1.83</param>
</service>
</services>
4 changes: 2 additions & 2 deletions rust-stable-image/rust-and-cargo-pin.check
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
requires:cargo1.82
requires:rust1.82
requires:cargo1.83
requires:rust1.83

0 comments on commit e2b6a57

Please sign in to comment.