Skip to content

Commit cc0d36a

Browse files
author
SUSE Update Bot
committed
Test build for #3014 
1 parent 347ec55 commit cc0d36a

File tree

8 files changed

+45
-16
lines changed

8 files changed

+45
-16
lines changed

‎apache-tomcat-10-image/_service‎

Lines changed: 12 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"/>
@@ -16,4 +17,14 @@
1617
<param name="regex">%%tomcat_version%%</param>
1718
<param name="package">tomcat10</param>
1819
</service>
19-
</services>
20+
<service mode="buildtime" name="replace_using_package_version">
21+
<param name="file">Dockerfile.openjdk17</param>
22+
<param name="regex">%%tomcat_version%%</param>
23+
<param name="package">tomcat</param>
24+
</service>
25+
<service mode="buildtime" name="replace_using_package_version">
26+
<param name="file">Dockerfile.openjdk21</param>
27+
<param name="regex">%%tomcat_version%%</param>
28+
<param name="package">tomcat</param>
29+
</service>
30+
</services>

‎apache-tomcat-9-image/_service‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
5+
<service mode="buildtime" name="replace_using_package_version">
6+
<param name="file">Dockerfile.openjdk17</param>
7+
<param name="regex">%%tomcat_version%%</param>
8+
<param name="package">tomcat10</param>
9+
</service>
10+
<service mode="buildtime" name="replace_using_package_version">
11+
<param name="file">Dockerfile.openjdk21</param>
12+
<param name="regex">%%tomcat_version%%</param>
13+
<param name="package">tomcat10</param>
14+
</service>
15+
<service mode="buildtime" name="replace_using_package_version">
16+
<param name="file">Dockerfile.openjdk25</param>
17+
<param name="regex">%%tomcat_version%%</param>
18+
<param name="package">tomcat10</param>
19+
</service>
420
<service mode="buildtime" name="replace_using_package_version">
521
<param name="file">Dockerfile.openjdk17</param>
622
<param name="regex">%%tomcat_version%%</param>
@@ -11,4 +27,4 @@
1127
<param name="regex">%%tomcat_version%%</param>
1228
<param name="package">tomcat</param>
1329
</service>
14-
</services>
30+
</services>

‎base-fips-image/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RUN set -euo pipefail; zypper -n clean -a; \
3535

3636
# Define labels according to https://en.opensuse.org/Building_derived_containers
3737
# labelprefix=org.opensuse.bci.base-fips
38-
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI FIPS-140-3"
39-
LABEL org.opencontainers.image.description="FIPS-140-3 container based on the openSUSE Tumbleweed Base Container Image."
38+
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI in FIPS-140-3 mode"
39+
LABEL org.opencontainers.image.description="in FIPS-140-3 mode container based on the openSUSE Tumbleweed Base Container Image."
4040
LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%-%RELEASE%"
4141
LABEL org.opencontainers.image.url="https://www.opensuse.org"
4242
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
@@ -7,7 +7,7 @@
77

88

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

1212

1313
## 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
@@ -42,7 +42,7 @@ FROM scratch
4242
COPY --from=builder /target /
4343
# Define labels according to https://en.opensuse.org/Building_derived_containers
4444
# labelprefix=org.opensuse.bci.micro-fips
45-
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI FIPS-140-3 Micro"
45+
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI in FIPS-140-3 mode Micro"
4646
LABEL org.opencontainers.image.description="A FIPS enforcing micro environment for containers based on the openSUSE Tumbleweed Base Container Image."
4747
LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%-%RELEASE%"
4848
LABEL org.opencontainers.image.url="https://www.opensuse.org"

‎micro-fips-image/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# openSUSE Tumbleweed BCI FIPS-140-3 Micro: Suitable for deploying static binaries
1+
# openSUSE Tumbleweed BCI in FIPS-140-3 mode Micro: Suitable for deploying static binaries
22
![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
33

44
## Description
@@ -9,7 +9,7 @@ use case for the image is deploying static binaries produced externally or
99
during multi-stage builds.
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
## Usage
1515

0 commit comments

Comments
 (0)