Skip to content

Commit 6f76ac9

Browse files
author
SUSE Update Bot
committed
Test build for #3014 
1 parent b634290 commit 6f76ac9

14 files changed

Lines changed: 44 additions & 42 deletions

File tree

‎base-fips-image/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ RUN set -euo pipefail; zypper -n clean -a; \
3636
# Define labels according to https://en.opensuse.org/Building_derived_containers
3737
# labelprefix=com.suse.bci.base-fips
3838
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
39-
LABEL org.opencontainers.image.title="SLE BCI 16 FIPS-140-3"
40-
LABEL org.opencontainers.image.description="16 FIPS-140-3 container based on the SLE Base Container Image."
39+
LABEL org.opencontainers.image.title="SLE BCI 16 in FIPS-140-3 mode"
40+
LABEL org.opencontainers.image.description="16 in FIPS-140-3 mode container based on the SLE Base Container Image."
4141
LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%-%RELEASE%"
4242
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
4343
LABEL org.opencontainers.image.created="%BUILDTIME%"

‎base-fips-image/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
This base container image is configured with FIPS mode enabled by default, but
12-
does not include any certified binaries.
12+
**does not** include any certified binaries.
1313

1414

1515
## Usage

‎cdi-image/_service‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
45
<service mode="buildtime" name="replace_using_package_version">
56
<param name="file">Dockerfile.apiserver</param>
67
<param name="regex">%%cdi_ver%%</param>
7-
<param name="package">containerized-data-importer-uploadproxy</param>
8+
<param name="package">containerized-data-importer-apiserver</param>
89
<param name="parse-version">patch</param>
910
</service>
1011
<service mode="buildtime" name="replace_using_package_version">
1112
<param name="file">Dockerfile.cloner</param>
1213
<param name="regex">%%cdi_ver%%</param>
13-
<param name="package">containerized-data-importer-uploadproxy</param>
14+
<param name="package">containerized-data-importer-cloner</param>
1415
<param name="parse-version">patch</param>
1516
</service>
1617
<service mode="buildtime" name="replace_using_package_version">
1718
<param name="file">Dockerfile.controller</param>
1819
<param name="regex">%%cdi_ver%%</param>
19-
<param name="package">containerized-data-importer-uploadproxy</param>
20+
<param name="package">containerized-data-importer-controller</param>
2021
<param name="parse-version">patch</param>
2122
</service>
2223
<service mode="buildtime" name="replace_using_package_version">
2324
<param name="file">Dockerfile.importer</param>
2425
<param name="regex">%%cdi_ver%%</param>
25-
<param name="package">containerized-data-importer-uploadproxy</param>
26+
<param name="package">containerized-data-importer-importer</param>
2627
<param name="parse-version">patch</param>
2728
</service>
2829
<service mode="buildtime" name="replace_using_package_version">
2930
<param name="file">Dockerfile.operator</param>
3031
<param name="regex">%%cdi_ver%%</param>
31-
<param name="package">containerized-data-importer-uploadproxy</param>
32+
<param name="package">containerized-data-importer-operator</param>
3233
<param name="parse-version">patch</param>
3334
</service>
3435
<service mode="buildtime" name="replace_using_package_version">
@@ -40,7 +41,7 @@
4041
<service mode="buildtime" name="replace_using_package_version">
4142
<param name="file">Dockerfile.uploadserver</param>
4243
<param name="regex">%%cdi_ver%%</param>
43-
<param name="package">containerized-data-importer-uploadproxy</param>
44+
<param name="package">containerized-data-importer-uploadserver</param>
4445
<param name="parse-version">patch</param>
4546
</service>
46-
</services>rvices>
47+
</services>

‎kubevirt-image/_service‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
@@ -49,4 +50,4 @@
4950
<param name="package">kubevirt</param>
5051
<param name="parse-version">patch</param>
5152
</service>
52-
</services>
53+
</services>

‎micro-fips-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ COPY --from=builder /target /
4343
# Define labels according to https://en.opensuse.org/Building_derived_containers
4444
# labelprefix=com.suse.bci.micro-fips
4545
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
46-
LABEL org.opencontainers.image.title="SLE BCI 16 FIPS-140-3 Micro"
46+
LABEL org.opencontainers.image.title="SLE BCI 16 in FIPS-140-3 mode Micro"
4747
LABEL org.opencontainers.image.description="A FIPS enforcing micro environment for containers based on the SLE Base Container Image."
4848
LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%-%RELEASE%"
4949
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"

‎micro-fips-image/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SLE BCI 16 FIPS-140-3 Micro: Suitable for deploying static binaries
1+
# SLE BCI 16 in FIPS-140-3 mode Micro: Suitable for deploying static binaries
22
![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
33
[![SLSA](https://img.shields.io/badge/SLSA_(v0.1)-Level_4-Green)](https://documentation.suse.com/sbp/server-linux/html/SBP-SLSA4/)
44
[![Provenance: Available](https://img.shields.io/badge/Provenance-Available-Green)](https://documentation.suse.com/container/all/html/Container-guide/index.html#container-verify)
@@ -11,7 +11,7 @@ use case for the image is deploying static binaries produced externally or
1111
during multi-stage builds.
1212

1313
This base container image is configured with FIPS mode enabled by default, but
14-
does not include any certified binaries.
14+
**does not** include any certified binaries.
1515

1616
## Usage
1717

‎rust-oldstable-image/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#!BuildTag: bci/rust:oldstable
2020
#!BuildTag: bci/rust:%%RUST_VERSION%%-2.%RELEASE%
2121
#!BuildTag: bci/rust:%%RUST_VERSION%%
22-
#!BuildTag: bci/rust:1.87
22+
#!BuildTag: bci/rust:1.88
2323
#!BuildName: bci-rust-oldstable
24-
#!BuildVersion: 16.0.1.87.2
24+
#!BuildVersion: 16.0.1.88.2
2525
FROM registry.suse.com/bci/bci-base:16.0
2626

2727
RUN set -euo pipefail; \
28-
zypper -n install --no-recommends rust1.87 cargo1.87
28+
zypper -n install --no-recommends rust1.88 cargo1.88
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/*; \
@@ -38,8 +38,8 @@ RUN set -euo pipefail; zypper -n clean -a; \
3838
# Define labels according to https://en.opensuse.org/Building_derived_containers
3939
# labelprefix=com.suse.bci.rust
4040
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
41-
LABEL org.opencontainers.image.title="SLE BCI Rust 1.87"
42-
LABEL org.opencontainers.image.description="Rust 1.87 container based on the SLE Base Container Image."
41+
LABEL org.opencontainers.image.title="SLE BCI Rust 1.88"
42+
LABEL org.opencontainers.image.description="Rust 1.88 container based on the SLE Base Container Image."
4343
LABEL org.opencontainers.image.version="%%RUST_VERSION%%"
4444
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
4545
LABEL org.opencontainers.image.created="%BUILDTIME%"
@@ -49,7 +49,7 @@ LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-2.%RELEASE%"
4949
LABEL org.opensuse.reference="registry.suse.com/bci/rust:%%RUST_VERSION%%-2.%RELEASE%"
5050
LABEL org.openbuildservice.disturl="%DISTURL%"
5151
LABEL com.suse.supportlevel="l3"
52-
LABEL com.suse.supportlevel.until="2025-08-28"
52+
LABEL com.suse.supportlevel.until="2025-10-09"
5353
LABEL com.suse.eula="sle-bci"
5454
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
5555
LABEL com.suse.release-stage="released"

‎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
[![SLSA](https://img.shields.io/badge/SLSA_(v0.1)-Level_4-Green)](https://documentation.suse.com/sbp/server-linux/html/SBP-SLSA4/)
@@ -13,8 +13,8 @@
1313
To compile and deploy an application, copy the sources, fetch dependencies, and build the binary:
1414

1515
```Dockerfile
16-
# Build the application using the Rust 1.87 container image
17-
FROM registry.suse.com/bci/rust:1.87 as build
16+
# Build the application using the Rust 1.88 container image
17+
FROM registry.suse.com/bci/rust:1.88 as build
1818

1919
WORKDIR /app
2020

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

4444
```ShellSession
45-
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.87 cargo build --release
45+
$ podman run --rm -v "$PWD":/app:Z -w /app registry.suse.com/bci/rust:1.88 cargo build --release
4646
```
4747

4848
**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

0 commit comments

Comments
 (0)