Skip to content

Commit

Permalink
Test build for #1631
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Sep 10, 2024
1 parent 0c7de34 commit 506f2be
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
18 changes: 9 additions & 9 deletions rust-oldstable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@

#!BuildTag: bci/rust:oldstable
#!BuildTag: bci/rust:oldstable-2.%RELEASE%
#!BuildTag: bci/rust:1.79
#!BuildTag: bci/rust:1.79-2.%RELEASE%
#!BuildTag: bci/rust:1.80
#!BuildTag: bci/rust:1.80-2.%RELEASE%
#!BuildTag: bci/rust:%%RUST_VERSION%%
#!BuildTag: bci/rust:%%RUST_VERSION%%-2.%RELEASE%
#!BuildName: bci-rust-oldstable
#!BuildVersion: 15.7.1.79.2
#!BuildVersion: 15.7.1.80.2
FROM bci/bci-base:15.7

RUN set -euo pipefail; zypper -n in --no-recommends rust1.79 cargo1.79 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends rust1.80 cargo1.80 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/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="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE BCI Rust 1.79"
LABEL org.opencontainers.image.description="Rust 1.79 container based on the SLE Base Container Image."
LABEL org.opencontainers.image.title="SLE BCI Rust 1.80"
LABEL org.opencontainers.image.description="Rust 1.80 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%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="1.79-2.%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.79-2.%RELEASE%"
LABEL org.opencontainers.image.ref.name="1.80-2.%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.80-2.%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.supportlevel.until="2024-09-26"
LABEL com.suse.supportlevel.until="2024-11-07"
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="beta"
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.79 Container Image
# Rust 1.80 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)
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.79 container image
FROM registry.suse.com/bci/rust:1.79 as build
# Build the application using the Rust 1.80 container image
FROM registry.suse.com/bci/rust:1.80 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.79 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/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`.
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 name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%RUST_VERSION%%</param>
<param name="package">rust1.79</param>
<param name="package">rust1.80</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.79</param>
<param name="package">cargo1.80</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.79
requires:rust1.79
requires:cargo1.80
requires:rust1.80
18 changes: 9 additions & 9 deletions rust-stable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@

#!BuildTag: bci/rust:stable
#!BuildTag: bci/rust:stable-1.%RELEASE%
#!BuildTag: bci/rust:1.80
#!BuildTag: bci/rust:1.80-1.%RELEASE%
#!BuildTag: bci/rust:1.81
#!BuildTag: bci/rust:1.81-1.%RELEASE%
#!BuildTag: bci/rust:%%RUST_VERSION%%
#!BuildTag: bci/rust:%%RUST_VERSION%%-1.%RELEASE%
#!BuildName: bci-rust-stable
#!BuildVersion: 15.7.1.80.1
#!BuildVersion: 15.7.1.81.1
FROM bci/bci-base:15.7

RUN set -euo pipefail; zypper -n in --no-recommends rust1.80 cargo1.80 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends rust1.81 cargo1.81 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/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="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE BCI Rust 1.80"
LABEL org.opencontainers.image.description="Rust 1.80 container based on the SLE Base Container Image."
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.version="%%RUST_VERSION%%"
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="1.80-1.%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.80-1.%RELEASE%"
LABEL org.opencontainers.image.ref.name="1.81-1.%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.81-1.%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.supportlevel.until="2024-11-07"
LABEL com.suse.supportlevel.until="2024-12-19"
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="beta"
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.80 Container Image
# Rust 1.81 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)
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.80 container image
FROM registry.suse.com/bci/rust:1.80 as build
# Build the application using the Rust 1.81 container image
FROM registry.suse.com/bci/rust:1.81 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.80 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.81 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 name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%RUST_VERSION%%</param>
<param name="package">rust1.80</param>
<param name="package">rust1.81</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.80</param>
<param name="package">cargo1.81</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.80
requires:rust1.80
requires:cargo1.81
requires:rust1.81

0 comments on commit 506f2be

Please sign in to comment.