Skip to content

Commit 347ec55

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #3004 from SUSE/for-deploy-Tumbleweed
🤖: Update build recipes for Tumbleweed
2 parents cd96bb2 + b9c3c82 commit 347ec55

14 files changed

Lines changed: 66 additions & 48 deletions

File tree

‎golang-oldstable-image/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,14 @@ ENV GOPATH="/go"
5555
ENV GOTOOLCHAIN="local"
5656
ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
5757

58-
# only available on go's tsan_arch architectures
59-
#!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
60-
RUN set -euo pipefail; if zypper -n install go1.24-race; then zypper -n clean -a; fi
61-
RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
62-
RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
63-
rm -rf {/target,}/run/*; \
64-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
65-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
66-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
67-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
68-
69-
WORKDIR /go
58+
# only available on go's tsan_arch architectures
59+
#!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
60+
RUN set -euo pipefail; if zypper -n install go1.24-race; then zypper -n clean -a; fi
61+
WORKDIR /go
62+
RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
63+
RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
64+
rm -rf {/target,}/run/*; \
65+
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
66+
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
67+
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
68+
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled

‎golang-oldstable-image/golang-oldstable-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Oct 6 15:31:11 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- remove excessive whitespace
5+
16
-------------------------------------------------------------------
27
Mon Sep 29 09:32:28 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
38

‎golang-stable-image/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,14 @@ ENV GOPATH="/go"
5656
ENV GOTOOLCHAIN="local"
5757
ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
5858

59-
# only available on go's tsan_arch architectures
60-
#!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
61-
RUN set -euo pipefail; if zypper -n install go1.25-race; then zypper -n clean -a; fi
62-
RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
63-
RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
64-
rm -rf {/target,}/run/*; \
65-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
66-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
67-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
68-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
69-
70-
WORKDIR /go
59+
# only available on go's tsan_arch architectures
60+
#!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
61+
RUN set -euo pipefail; if zypper -n install go1.25-race; then zypper -n clean -a; fi
62+
WORKDIR /go
63+
RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
64+
RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
65+
rm -rf {/target,}/run/*; \
66+
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
67+
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
68+
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
69+
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled

‎golang-stable-image/golang-stable-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Oct 6 15:31:11 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- remove excessive whitespace
5+
16
-------------------------------------------------------------------
27
Mon Sep 29 09:32:28 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
38

‎rust-oldstable-image/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#!BuildTag: opensuse/bci/rust:oldstable
2020
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-2.%RELEASE%
2121
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%
22-
#!BuildTag: opensuse/bci/rust:1.87
22+
#!BuildTag: opensuse/bci/rust:1.88
2323

2424
FROM opensuse/tumbleweed:latest
2525

2626
RUN set -euo pipefail; \
27-
zypper -n install --no-recommends rust1.87 cargo1.87
27+
zypper -n install --no-recommends rust1.88 cargo1.88
2828
RUN set -euo pipefail; zypper -n clean -a; \
2929
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
3030
rm -rf {/target,}/run/*; \
@@ -36,8 +36,8 @@ RUN set -euo pipefail; zypper -n clean -a; \
3636

3737
# Define labels according to https://en.opensuse.org/Building_derived_containers
3838
# labelprefix=org.opensuse.bci.rust
39-
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.87"
40-
LABEL org.opencontainers.image.description="Rust 1.87 container based on the openSUSE Tumbleweed Base Container Image."
39+
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.88"
40+
LABEL org.opencontainers.image.description="Rust 1.88 container based on the openSUSE Tumbleweed Base Container Image."
4141
LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
4242
LABEL org.opencontainers.image.url="https://www.opensuse.org"
4343
LABEL org.opencontainers.image.created="%BUILDTIME%"

‎rust-oldstable-image/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Rust 1.87 Container Image
1+
# Rust 1.88 Container Image
22

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

@@ -11,8 +11,8 @@
1111
To compile and deploy an application, copy the sources, fetch dependencies, and build the binary:
1212

1313
```Dockerfile
14-
# Build the application using the Rust 1.87 container image
15-
FROM registry.opensuse.org/opensuse/bci/rust:1.87 as build
14+
# Build the application using the Rust 1.88 container image
15+
FROM registry.opensuse.org/opensuse/bci/rust:1.88 as build
1616

1717
WORKDIR /app
1818

@@ -40,7 +40,7 @@ There are situations, where you don't want to run an application inside a contai
4040
To compile the application, without running it inside a container instance, use the following command:
4141

4242
```ShellSession
43-
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/rust:1.87 cargo build --release
43+
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/rust:1.88 cargo build --release
4444
```
4545

4646
**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`.

‎rust-oldstable-image/_service‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<service mode="buildtime" name="replace_using_package_version">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%RUST_VERSION%%</param>
7-
<param name="package">rust1.87</param>
7+
<param name="package">rust1.88</param>
88
</service>
99
<service mode="buildtime" name="replace_using_package_version">
1010
<param name="file">Dockerfile</param>
1111
<param name="regex">%%CARGO_VERSION%%</param>
12-
<param name="package">cargo1.87</param>
12+
<param name="package">cargo1.88</param>
1313
</service>
1414
</services>

‎rust-oldstable-image/rust-and-cargo-pin.check‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requires:cargo1.87
2-
requires:rust1.87
1+
requires:cargo1.88
2+
requires:rust1.88

‎rust-oldstable-image/rust-oldstable-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Oct 6 15:31:31 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- rust 1.90 for stable, rust 1.89 for oldstable
5+
16
-------------------------------------------------------------------
27
Mon Sep 29 09:32:29 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
38

‎rust-stable-image/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#!BuildTag: opensuse/bci/rust:stable
2020
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%-1.%RELEASE%
2121
#!BuildTag: opensuse/bci/rust:%%RUST_VERSION%%
22-
#!BuildTag: opensuse/bci/rust:1.88
22+
#!BuildTag: opensuse/bci/rust:1.90
2323
#!BuildTag: opensuse/bci/rust:latest
2424

2525
FROM opensuse/tumbleweed:latest
2626

2727
RUN set -euo pipefail; \
28-
zypper -n install --no-recommends rust1.88 cargo1.88
28+
zypper -n install --no-recommends rust1.90 cargo1.90
2929
RUN set -euo pipefail; zypper -n clean -a; \
3030
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
3131
rm -rf {/target,}/run/*; \
@@ -37,8 +37,8 @@ RUN set -euo pipefail; zypper -n clean -a; \
3737

3838
# Define labels according to https://en.opensuse.org/Building_derived_containers
3939
# labelprefix=org.opensuse.bci.rust
40-
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.88"
41-
LABEL org.opencontainers.image.description="Rust 1.88 container based on the openSUSE Tumbleweed Base Container Image."
40+
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.90"
41+
LABEL org.opencontainers.image.description="Rust 1.90 container based on the openSUSE Tumbleweed Base Container Image."
4242
LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
4343
LABEL org.opencontainers.image.url="https://www.opensuse.org"
4444
LABEL org.opencontainers.image.created="%BUILDTIME%"

0 commit comments

Comments
 (0)