Test build for #1815

SUSE · Oct 23, 2024 · b0cb9fd · b0cb9fd
1 parent a658460
commit b0cb9fd
Show file tree

Hide file tree

Showing 66 changed files with 126 additions and 262 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -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
@@ -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

diff --git a/389-ds-container/_service b/389-ds-container/_service
@@ -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>

diff --git a/alertmanager-image/_service b/alertmanager-image/_service
@@ -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>

diff --git a/apache-tomcat-10-image/Dockerfile.openjdk17 b/apache-tomcat-10-image/Dockerfile.openjdk17
@@ -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.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%%"

diff --git a/apache-tomcat-10-image/Dockerfile.openjdk21 b/apache-tomcat-10-image/Dockerfile.openjdk21
@@ -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.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%%"

diff --git a/apache-tomcat-10-image/Dockerfile.openjdk23 b/apache-tomcat-10-image/Dockerfile.openjdk23
@@ -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.openjdk23.md"
+LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-image/README.openjdk23.md"
 LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
 ENV TOMCAT_MAJOR="10"
 ENV TOMCAT_VERSION="%%tomcat_version%%"

diff --git a/apache-tomcat-10-image/_multibuild b/apache-tomcat-10-image/_multibuild
@@ -1,5 +1,5 @@
 <multibuild>
-    <package>openjdk17</package>
-    <package>openjdk21</package>
     <package>openjdk23</package>
+    <package>openjdk21</package>
+    <package>openjdk17</package>
 </multibuild>
diff --git a/apache-tomcat-10-image/_service b/apache-tomcat-10-image/_service
@@ -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.openjdk23</param>
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>
@@ -12,7 +12,7 @@
     <param name="package">tomcat10</param>
   </service>
   <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile.openjdk23</param>
+    <param name="file">Dockerfile.openjdk17</param>
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>

diff --git a/apache-tomcat-10-image/apache-tomcat-image.changes b/apache-tomcat-10-image/apache-tomcat-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Wed Oct 23 14:47:09 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- First version of the Apache Tomcat %%tomcat_version%% BCI
diff --git a/apache-tomcat-9-image/Dockerfile b/apache-tomcat-9-image/Dockerfile
diff --git a/apache-tomcat-9-image/_multibuild b/apache-tomcat-9-image/_multibuild
diff --git a/apache-tomcat-9-image/apache-tomcat-9-image.changes b/apache-tomcat-9-image/apache-tomcat-9-image.changes
diff --git a/apache-tomcat-9-image/Dockerfile.openjdk17 → apache-tomcat-image/Dockerfile.openjdk17 b/apache-tomcat-9-image/Dockerfile.openjdk17 → apache-tomcat-image/Dockerfile.openjdk17
@@ -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-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%%"

diff --git a/apache-tomcat-9-image/README.openjdk17.md → apache-tomcat-image/README.openjdk17.md b/apache-tomcat-9-image/README.openjdk17.md → apache-tomcat-image/README.openjdk17.md
diff --git a/apache-tomcat-9-image/_service → apache-tomcat-image/_service b/apache-tomcat-9-image/_service → apache-tomcat-image/_service
@@ -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>

diff --git a/apache-tomcat-image/apache-tomcat-image.changes b/apache-tomcat-image/apache-tomcat-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Wed Oct 23 14:47:08 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- First version of the Apache Tomcat %%tomcat_version%% BCI
diff --git a/blackbox_exporter-image/_service b/blackbox_exporter-image/_service
@@ -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>

diff --git a/busybox-image/_service b/busybox-image/_service
@@ -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>
diff --git a/distribution-image/_service b/distribution-image/_service
@@ -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>

diff --git a/gcc-12-image/_service b/gcc-12-image/_service
@@ -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>

diff --git a/gcc-13-image/_service b/gcc-13-image/_service
@@ -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>

diff --git a/gcc-14-image/_service b/gcc-14-image/_service
@@ -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>

diff --git a/git-image/_service b/git-image/_service
@@ -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>

diff --git a/gitea-runner-image/_service b/gitea-runner-image/_service
@@ -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>
diff --git a/golang-oldstable-image/_service b/golang-oldstable-image/_service
@@ -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>

diff --git a/golang-stable-image/_service b/golang-stable-image/_service
@@ -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>

diff --git a/grafana-image/_service b/grafana-image/_service
@@ -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>

diff --git a/helm-image/_service b/helm-image/_service
@@ -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>
diff --git a/init-image/_service b/init-image/_service
@@ -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>
diff --git a/kiwi-image/_service b/kiwi-image/_service
@@ -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>
diff --git a/mariadb-client-image/_service b/mariadb-client-image/_service
@@ -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>