Skip to content

Commit

Permalink
Test build for #1815
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Oct 10, 2024
1 parent f406c18 commit d25e27d
Show file tree
Hide file tree
Showing 66 changed files with 126 additions and 247 deletions.
18 changes: 2 additions & 16 deletions .obs/workflows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ staging_build:
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: apache-tomcat-10-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: apache-tomcat-10-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: apache-tomcat-9-image
source_package: apache-tomcat-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
Expand Down Expand Up @@ -253,13 +245,7 @@ refresh_devel_BCI:
package: apache-tomcat-10-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: apache-tomcat-10-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: apache-tomcat-10-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: apache-tomcat-9-image
package: apache-tomcat-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: blackbox_exporter-image
Expand Down
4 changes: 2 additions & 2 deletions 389-ds-container/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%389ds_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions alertmanager-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%alertmanager_minor_version%%</param>
Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk17.md"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk17.md"
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
ENV TOMCAT_MAJOR="10"
ENV TOMCAT_VERSION="%%tomcat_version%%"
Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk21
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk21.md"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk21.md"
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
ENV TOMCAT_MAJOR="10"
ENV TOMCAT_VERSION="%%tomcat_version%%"
Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk22
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk22.md"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk22.md"
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
ENV TOMCAT_MAJOR="10"
ENV TOMCAT_VERSION="%%tomcat_version%%"
Expand Down
4 changes: 2 additions & 2 deletions apache-tomcat-10-image/_multibuild
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<multibuild>
<package>openjdk17</package>
<package>openjdk21</package>
<package>openjdk22</package>
<package>openjdk21</package>
<package>openjdk17</package>
</multibuild>
8 changes: 4 additions & 4 deletions apache-tomcat-10-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile.openjdk17</param>
<param name="file">Dockerfile.openjdk22</param>
<param name="regex">%%tomcat_version%%</param>
<param name="package">tomcat10</param>
</service>
Expand All @@ -12,7 +12,7 @@
<param name="package">tomcat10</param>
</service>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile.openjdk22</param>
<param name="file">Dockerfile.openjdk17</param>
<param name="regex">%%tomcat_version%%</param>
<param name="package">tomcat10</param>
</service>
Expand Down
4 changes: 4 additions & 0 deletions apache-tomcat-10-image/apache-tomcat-image.changes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Oct 10 08:54:19 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>

- First version of the Apache Tomcat %%tomcat_version%% BCI
3 changes: 0 additions & 3 deletions apache-tomcat-9-image/Dockerfile
View file

This file was deleted.

3 changes: 0 additions & 3 deletions apache-tomcat-9-image/_multibuild
View file

This file was deleted.

109 changes: 0 additions & 109 deletions apache-tomcat-9-image/apache-tomcat-9-image.changes
View file

This file was deleted.

2 changes: 1 addition & 1 deletion apache-tomcat-9-image/Dockerfile.openjdk17 → apache-tomcat-image/Dockerfile.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-9-image/README.openjdk17.md"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk17.md"
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
ENV TOMCAT_MAJOR="9"
ENV TOMCAT_VERSION="%%tomcat_version%%"
Expand Down
0 apache-tomcat-9-image/README.openjdk17.md → apache-tomcat-image/README.openjdk17.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apache-tomcat-9-image/_service → apache-tomcat-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile.openjdk17</param>
<param name="regex">%%tomcat_version%%</param>
Expand Down
4 changes: 4 additions & 0 deletions apache-tomcat-image/apache-tomcat-image.changes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Oct 10 08:54:18 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>

- First version of the Apache Tomcat %%tomcat_version%% BCI
4 changes: 2 additions & 2 deletions blackbox_exporter-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%blackbox_exporter_minor_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions busybox-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<services>
<service mode="buildtime" name="kiwi_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="kiwi_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
</services>
4 changes: 2 additions & 2 deletions distribution-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="kiwi_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="kiwi_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">distribution-image.kiwi</param>
<param name="regex">%%registry_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions gcc-12-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%gcc_minor_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions gcc-13-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%gcc_minor_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions gcc-14-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%gcc_minor_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions git-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="kiwi_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="kiwi_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">git-image.kiwi</param>
<param name="regex">%%git_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions gitea-runner-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
</services>
4 changes: 2 additions & 2 deletions golang-oldstable-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%golang_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions golang-stable-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%golang_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions grafana-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%grafana_major_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions helm-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<services>
<service mode="buildtime" name="kiwi_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="kiwi_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
</services>
4 changes: 2 additions & 2 deletions init-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
</services>
4 changes: 2 additions & 2 deletions kiwi-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
</services>
4 changes: 2 additions & 2 deletions mariadb-client-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%mariadb_version%%</param>
Expand Down
4 changes: 2 additions & 2 deletions mariadb-image/_service
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="docker_label_helper" mode="buildtime" />
<service name="kiwi_metainfo_helper" mode="buildtime" />
<service name="replace_using_package_version" mode="buildtime">
<param name="file">docker-entrypoint.sh</param>
<param name="regex">%%mariadb_version%%</param>
Expand Down
Loading

0 comments on commit d25e27d

Please sign in to comment.