Skip to content

Commit d25e27d

Browse files
author
SUSE Update Bot
committed
Test build for #1815 
1 parent f406c18 commit d25e27d

66 files changed

Lines changed: 126 additions & 247 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.obs/workflows.yml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ staging_build:
1515
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
1616
- branch_package:
1717
source_project: home:defolos:BCI:CR:Tumbleweed
18-
source_package: apache-tomcat-10-image
19-
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
20-
- branch_package:
21-
source_project: home:defolos:BCI:CR:Tumbleweed
22-
source_package: apache-tomcat-10-image
23-
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
24-
- branch_package:
25-
source_project: home:defolos:BCI:CR:Tumbleweed
26-
source_package: apache-tomcat-9-image
18+
source_package: apache-tomcat-image
2719
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
2820
- branch_package:
2921
source_project: home:defolos:BCI:CR:Tumbleweed
@@ -253,13 +245,7 @@ refresh_devel_BCI:
253245
package: apache-tomcat-10-image
254246
- trigger_services:
255247
project: devel:BCI:Tumbleweed
256-
package: apache-tomcat-10-image
257-
- trigger_services:
258-
project: devel:BCI:Tumbleweed
259-
package: apache-tomcat-10-image
260-
- trigger_services:
261-
project: devel:BCI:Tumbleweed
262-
package: apache-tomcat-9-image
248+
package: apache-tomcat-image
263249
- trigger_services:
264250
project: devel:BCI:Tumbleweed
265251
package: blackbox_exporter-image

‎389-ds-container/_service‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%389ds_version%%</param>

‎alertmanager-image/_service‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%alertmanager_minor_version%%</param>

‎apache-tomcat-10-image/Dockerfile.openjdk17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
4646
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
4747
LABEL org.opensuse.release-stage="released"
4848
# endlabelprefix
49-
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk17.md"
49+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk17.md"
5050
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
5151
ENV TOMCAT_MAJOR="10"
5252
ENV TOMCAT_VERSION="%%tomcat_version%%"

‎apache-tomcat-10-image/Dockerfile.openjdk21‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
4646
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
4747
LABEL org.opensuse.release-stage="released"
4848
# endlabelprefix
49-
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk21.md"
49+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk21.md"
5050
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
5151
ENV TOMCAT_MAJOR="10"
5252
ENV TOMCAT_VERSION="%%tomcat_version%%"

‎apache-tomcat-10-image/Dockerfile.openjdk22‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
4747
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
4848
LABEL org.opensuse.release-stage="released"
4949
# endlabelprefix
50-
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk22.md"
50+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk22.md"
5151
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
5252
ENV TOMCAT_MAJOR="10"
5353
ENV TOMCAT_VERSION="%%tomcat_version%%"

‎apache-tomcat-10-image/_multibuild‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<multibuild>
2-
<package>openjdk17</package>
3-
<package>openjdk21</package>
42
<package>openjdk22</package>
3+
<package>openjdk21</package>
4+
<package>openjdk17</package>
55
</multibuild>

‎apache-tomcat-10-image/_service‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
5-
<param name="file">Dockerfile.openjdk17</param>
5+
<param name="file">Dockerfile.openjdk22</param>
66
<param name="regex">%%tomcat_version%%</param>
77
<param name="package">tomcat10</param>
88
</service>
@@ -12,7 +12,7 @@
1212
<param name="package">tomcat10</param>
1313
</service>
1414
<service name="replace_using_package_version" mode="buildtime">
15-
<param name="file">Dockerfile.openjdk22</param>
15+
<param name="file">Dockerfile.openjdk17</param>
1616
<param name="regex">%%tomcat_version%%</param>
1717
<param name="package">tomcat10</param>
1818
</service>

‎apache-tomcat-10-image/apache-tomcat-image.changes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-------------------------------------------------------------------
2+
Thu Oct 10 08:54:19 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- First version of the Apache Tomcat %%tomcat_version%% BCI

‎apache-tomcat-9-image/Dockerfile‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)