Skip to content

Commit fddb16e

Browse files
authored
Merge pull request #714 from SUSE/for-deploy-6
🤖: Update build recipes for SP6
2 parents e58f47d + f70b9c1 commit fddb16e

6 files changed

Lines changed: 32 additions & 22 deletions

File tree

rust-oldstable-image/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@
1616

1717
#!BuildTag: bci/rust:oldstable
1818
#!BuildTag: bci/rust:oldstable-2.%RELEASE%
19-
#!BuildTag: bci/rust:1.71
20-
#!BuildTag: bci/rust:1.71-2.%RELEASE%
19+
#!BuildTag: bci/rust:1.72
20+
#!BuildTag: bci/rust:1.72-2.%RELEASE%
2121
#!BuildName: bci-rust-oldstable
22-
#!BuildVersion: 15.6.1.71.2
22+
#!BuildVersion: 15.6.1.72.2
2323
FROM suse/sle15:15.6
2424

2525
MAINTAINER SUSE LLC (https://www.suse.com/)
2626

2727
# Define labels according to https://en.opensuse.org/Building_derived_containers
2828
# labelprefix=com.suse.bci.rust
29-
LABEL org.opencontainers.image.title="SLE BCI Rust 1.71"
30-
LABEL org.opencontainers.image.description="Rust 1.71 container based on the SLE Base Container Image."
31-
LABEL org.opencontainers.image.version="1.71"
29+
LABEL org.opencontainers.image.title="SLE BCI Rust 1.72"
30+
LABEL org.opencontainers.image.description="Rust 1.72 container based on the SLE Base Container Image."
31+
LABEL org.opencontainers.image.version="1.72"
3232
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
3333
LABEL org.opencontainers.image.created="%BUILDTIME%"
3434
LABEL org.opencontainers.image.vendor="SUSE LLC"
3535
LABEL org.opencontainers.image.source="%SOURCEURL%"
36-
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.71-2.%RELEASE%"
36+
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.72-2.%RELEASE%"
3737
LABEL org.openbuildservice.disturl="%DISTURL%"
3838
LABEL com.suse.supportlevel="l3"
39-
LABEL com.suse.supportlevel.until="2023-10-12"
39+
LABEL com.suse.supportlevel.until="2023-11-23"
4040
LABEL com.suse.eula="sle-bci"
4141
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
4242
LABEL com.suse.image-type="sle-bci"
4343
LABEL com.suse.release-stage="beta"
4444
# endlabelprefix
4545

46-
RUN set -euo pipefail; zypper -n in --no-recommends rust1.71 cargo1.71 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
46+
RUN set -euo pipefail; zypper -n in --no-recommends rust1.72 cargo1.72 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
4747
ENV RUST_VERSION="%%RUST_VERSION%%"
4848
ENV CARGO_VERSION="%%CARGO_VERSION%%"
4949
ENV CC="/usr/local/bin/gcc"

rust-oldstable-image/_service

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

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+
Fri Oct 13 15:00:25 UTC 2023 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Rust 1.73 for stable, 1.72 for oldstable
5+
16
-------------------------------------------------------------------
27
Thu Sep 28 14:29:34 UTC 2023 - Dirk Mueller <dmueller@suse.com>
38

rust-stable-image/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@
1616

1717
#!BuildTag: bci/rust:stable
1818
#!BuildTag: bci/rust:stable-1.%RELEASE%
19-
#!BuildTag: bci/rust:1.72
20-
#!BuildTag: bci/rust:1.72-1.%RELEASE%
19+
#!BuildTag: bci/rust:1.73
20+
#!BuildTag: bci/rust:1.73-1.%RELEASE%
2121
#!BuildName: bci-rust-stable
22-
#!BuildVersion: 15.6.1.72.1
22+
#!BuildVersion: 15.6.1.73.1
2323
FROM suse/sle15:15.6
2424

2525
MAINTAINER SUSE LLC (https://www.suse.com/)
2626

2727
# Define labels according to https://en.opensuse.org/Building_derived_containers
2828
# labelprefix=com.suse.bci.rust
29-
LABEL org.opencontainers.image.title="SLE BCI Rust 1.72"
30-
LABEL org.opencontainers.image.description="Rust 1.72 container based on the SLE Base Container Image."
31-
LABEL org.opencontainers.image.version="1.72"
29+
LABEL org.opencontainers.image.title="SLE BCI Rust 1.73"
30+
LABEL org.opencontainers.image.description="Rust 1.73 container based on the SLE Base Container Image."
31+
LABEL org.opencontainers.image.version="1.73"
3232
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
3333
LABEL org.opencontainers.image.created="%BUILDTIME%"
3434
LABEL org.opencontainers.image.vendor="SUSE LLC"
3535
LABEL org.opencontainers.image.source="%SOURCEURL%"
36-
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.72-1.%RELEASE%"
36+
LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.73-1.%RELEASE%"
3737
LABEL org.openbuildservice.disturl="%DISTURL%"
3838
LABEL com.suse.supportlevel="l3"
39-
LABEL com.suse.supportlevel.until="2023-11-23"
39+
LABEL com.suse.supportlevel.until="2024-01-04"
4040
LABEL com.suse.eula="sle-bci"
4141
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
4242
LABEL com.suse.image-type="sle-bci"
4343
LABEL com.suse.release-stage="beta"
4444
# endlabelprefix
4545

46-
RUN set -euo pipefail; zypper -n in --no-recommends rust1.72 cargo1.72 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
46+
RUN set -euo pipefail; zypper -n in --no-recommends rust1.73 cargo1.73 lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
4747
ENV RUST_VERSION="%%RUST_VERSION%%"
4848
ENV CARGO_VERSION="%%CARGO_VERSION%%"
4949
ENV CC="/usr/local/bin/gcc"

rust-stable-image/_service

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

rust-stable-image/rust-stable-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Fri Oct 13 15:00:25 UTC 2023 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Rust 1.73 for stable, 1.72 for oldstable
5+
16
-------------------------------------------------------------------
27
Thu Sep 28 14:29:34 UTC 2023 - Dirk Mueller <dmueller@suse.com>
38

0 commit comments

Comments
 (0)