Skip to content

Commit

Permalink
Merge pull request #1955 from SUSE/for-deploy-Tumbleweed
Browse files Browse the repository at this point in the history
🤖: Update build recipes for Tumbleweed
  • Loading branch information
dirkmueller authored Nov 6, 2024
2 parents e9ecd77 + e81adef commit 8278279
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 31 deletions.
8 changes: 4 additions & 4 deletions rust-oldstable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
#!BuildTag: opensuse/bci/rust:oldstable
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-2.%RELEASE%
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%
#!BuildTag: opensuse/bci/rust:1.80
#!BuildTag: opensuse/bci/rust:1.81

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; \
zypper -n install --no-recommends rust1.80 cargo1.80; \
zypper -n install --no-recommends rust1.81 cargo1.81; \
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.80"
LABEL org.opencontainers.image.description="Rust 1.80 container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.81"
LABEL org.opencontainers.image.description="Rust 1.81 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%"
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.80 Container Image
# Rust 1.81 Container Image

![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)

Expand All @@ -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.80 container image
FROM registry.opensuse.org/opensuse/bci/rust:1.80 as build
# Build the application using the Rust 1.81 container image
FROM registry.opensuse.org/opensuse/bci/rust:1.81 as build

WORKDIR /app

Expand Down Expand Up @@ -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.80 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/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-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.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-oldstable-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
5 changes: 5 additions & 0 deletions rust-oldstable-image/rust-oldstable-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 4 13:48:16 UTC 2024 - SUSE Update Bot <[email protected]>

- Bump Rust version to 1.81

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
8 changes: 4 additions & 4 deletions rust-stable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
#!BuildTag: opensuse/bci/rust:stable
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-1.%RELEASE%
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%
#!BuildTag: opensuse/bci/rust:1.81
#!BuildTag: opensuse/bci/rust:1.82
#!BuildTag: opensuse/bci/rust:latest

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; \
zypper -n install --no-recommends rust1.81 cargo1.81; \
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.81"
LABEL org.opencontainers.image.description="Rust 1.81 container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.82"
LABEL org.opencontainers.image.description="Rust 1.82 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%"
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.81 Container Image
# Rust 1.82 Container Image

![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)

Expand All @@ -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.81 container image
FROM registry.opensuse.org/opensuse/bci/rust:1.81 as build
# Build the application using the Rust 1.82 container image
FROM registry.opensuse.org/opensuse/bci/rust:1.82 as build

WORKDIR /app

Expand Down Expand Up @@ -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.81 cargo build --release
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/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-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.81</param>
<param name="package">rust1.82</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.81</param>
<param name="package">cargo1.82</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.81
requires:rust1.81
requires:cargo1.82
requires:rust1.82
5 changes: 5 additions & 0 deletions rust-stable-image/rust-stable-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 4 13:48:26 UTC 2024 - SUSE Update Bot <[email protected]>

- Bump Rust version to 1.82

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
12 changes: 6 additions & 6 deletions spack-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#!UseOBSRepositories
#!ExclusiveArch: aarch64 x86_64
#!BuildTag: opensuse/bci/spack:0.22.1-%RELEASE%
#!BuildTag: opensuse/bci/spack:0.22.1
#!BuildTag: opensuse/bci/spack:0.22.2-%RELEASE%
#!BuildTag: opensuse/bci/spack:0.22.2
#!BuildTag: opensuse/bci/spack:0.22
#!BuildTag: opensuse/bci/spack:latest

Expand All @@ -31,13 +31,13 @@ RUN set -euo pipefail; \
# labelprefix=org.opensuse.bci.spack
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Spack development"
LABEL org.opencontainers.image.description="Spack development container for building containerized HPC solution stacks, based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="0.22.1"
LABEL org.opencontainers.image.version="0.22.2"
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="0.22.1-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/spack:0.22.1-%RELEASE%"
LABEL org.opencontainers.image.ref.name="0.22.2-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/spack:0.22.2-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
Expand Down Expand Up @@ -65,7 +65,7 @@ RUN set -euo pipefail; mkdir -p /root/.spack \
&& rm -rf /root/*.* /run/nologin

# sanity check that the version from the tag is equal to the version of spack that we expect
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' spack | cut -d '.' -f -3)" = "0.22.1" ]
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' spack | cut -d '.' -f -3)" = "0.22.2" ]

WORKDIR /root
SHELL ["docker-shell"]
2 changes: 1 addition & 1 deletion spack-image/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Spack 0.22.1 container image
# Spack 0.22.2 container image
![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)

## Description
Expand Down
5 changes: 5 additions & 0 deletions spack-image/spack-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 4 10:04:54 UTC 2024 - SUSE Update Bot <[email protected]>

- Bump spack version to 0.22.2

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down

0 comments on commit 8278279

Please sign in to comment.