Test build for #2110

SUSE · Dec 3, 2024 · 9d84429 · 9d84429
1 parent c14f41d
commit 9d84429
Show file tree

Hide file tree

Showing 40 changed files with 178 additions and 56 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -193,6 +193,10 @@ staging_build:
         source_project: home:defolos:BCI:CR:SLE-15-SP7
         source_package: spack-image
         target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP7
+        source_package: stunnel-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
   filters:
     event: pull_request
 
@@ -354,6 +358,9 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:SLE-15-SP7
         package: spack-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP7
+        package: stunnel-image
   filters:
     event: push
     branches:

diff --git a/389-ds-container/_service b/389-ds-container/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%389ds_version%%</param>
     <param name="package">389-ds</param>

diff --git a/alertmanager-image/_service b/alertmanager-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%alertmanager_minor_version%%</param>
     <param name="package">golang-github-prometheus-alertmanager</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%alertmanager_patch_version%%</param>
     <param name="package">golang-github-prometheus-alertmanager</param>

diff --git a/blackbox_exporter-image/_service b/blackbox_exporter-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%blackbox_exporter_minor_version%%</param>
     <param name="package">prometheus-blackbox_exporter</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%blackbox_exporter_patch_version%%</param>
     <param name="package">prometheus-blackbox_exporter</param>

diff --git a/cosign-image/_service b/cosign-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%cosign_version%%</param>
     <param name="package">cosign</param>

diff --git a/distribution-image/_service b/distribution-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="kiwi_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">distribution-image.kiwi</param>
     <param name="regex">%%registry_version%%</param>
     <param name="package">distribution-registry</param>

diff --git a/gcc-14-image/_service b/gcc-14-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%gcc_minor_version%%</param>
     <param name="package">gcc14</param>

diff --git a/git-image/_service b/git-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="kiwi_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">git-image.kiwi</param>
     <param name="regex">%%git_version%%</param>
     <param name="package">git-core</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">git-image.kiwi</param>
     <param name="regex">%%git_major_version%%</param>
     <param name="package">git-core</param>

diff --git a/golang-oldstable-image/_service b/golang-oldstable-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.22</param>

diff --git a/golang-oldstable-openssl-image/_service b/golang-oldstable-openssl-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.22-openssl</param>

diff --git a/golang-stable-image/_service b/golang-stable-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.23</param>

diff --git a/golang-stable-openssl-image/_service b/golang-stable-openssl-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.23-openssl</param>

diff --git a/grafana-image/_service b/grafana-image/_service
@@ -1,19 +1,19 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_major_version%%</param>
     <param name="package">grafana</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_minor_version%%</param>
     <param name="package">grafana</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_patch_version%%</param>
     <param name="package">grafana</param>

diff --git a/kea-image/Dockerfile b/kea-image/Dockerfile
@@ -17,7 +17,6 @@
 
 #!BuildTag: suse/kea:2.6-%RELEASE%
 #!BuildTag: suse/kea:2.6
-#!BuildTag: suse/kea:latest
 #!BuildName: suse-kea-2.6
 #!BuildVersion: 15.7.2.6
 FROM suse/sle15:15.7
@@ -50,7 +49,7 @@ LABEL run="podman run --replace -it --privileged --network=host --name kea-dhcp4
 LABEL runcwd="podman run --replace -it --privileged --network=host --name kea-dhcp4 -v .:/etc/kea IMAGE kea-dhcp4  -c /etc/kea/kea-dhcp4.conf"
 LABEL run_dhcp6="podman run --replace -it --privileged --network=host --name kea-dhcp6 -v /etc/kea:/etc/kea IMAGE kea-dhcp6  -c /etc/kea/kea-dhcp6.conf"
 LABEL runcwd_dhcp6="podman run --replace -it --privileged --network=host --name kea-dhcp6 -v .:/etc/kea IMAGE kea-dhcp6  -c /etc/kea/kea-dhcp6.conf"
-EXPOSE 67 67/udp
+EXPOSE 67/tcp 67/udp
 
-    RUN mkdir -p /var/run/kea
-    
+ENV KEA_PIDFILE_DIR="/var/run/kea"
+RUN install -m 0750 -o root -g root -d /var/run/kea
diff --git a/nginx-image/_service b/nginx-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%nginx_version%%</param>
     <param name="package">nginx</param>

diff --git a/openjdk-21-devel-image/_service b/openjdk-21-devel-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
     <param name="package">java-21-openjdk-devel</param>

diff --git a/openjdk-21-image/_service b/openjdk-21-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
     <param name="package">java-21-openjdk</param>

diff --git a/pcp-image/_service b/pcp-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_major%%</param>
     <param name="package">pcp</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_minor%%</param>
     <param name="package">pcp</param>

diff --git a/php-apache8-image/_service b/php-apache8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>

diff --git a/php-fpm8-image/_service b/php-fpm8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>

diff --git a/php8-image/_service b/php8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>

diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile
@@ -45,7 +45,6 @@ LABEL org.opencontainers.image.ref.name="%%pg_patch_version%%-%RELEASE%"
 LABEL org.opensuse.reference="registry.suse.com/suse/postgres:%%pg_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="acc"
-LABEL com.suse.supportlevel.until="2031-07-31"
 LABEL com.suse.eula="sle-eula"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="beta"

diff --git a/postgres-16-image/_service b/postgres-16-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql16-server</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_patch_version%%</param>
     <param name="package">postgresql16-server</param>

diff --git a/postgres-17-image/Dockerfile b/postgres-17-image/Dockerfile
@@ -46,7 +46,6 @@ LABEL org.opencontainers.image.ref.name="%%pg_patch_version%%-%RELEASE%"
 LABEL org.opensuse.reference="registry.suse.com/suse/postgres:%%pg_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="acc"
-LABEL com.suse.supportlevel.until="2031-07-31"
 LABEL com.suse.eula="sle-eula"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="beta"

diff --git a/postgres-17-image/_service b/postgres-17-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql17-server</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_patch_version%%</param>
     <param name="package">postgresql17-server</param>

diff --git a/prometheus-image/_service b/prometheus-image/_service
@@ -1,19 +1,19 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_major_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_minor_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_patch_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>

diff --git a/python-3.11-image/_service b/python-3.11-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%py311_ver%%</param>
     <param name="package">python311-base</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pip_ver%%</param>
     <param name="package">python311-pip</param>

diff --git a/python-3.13-image/_service b/python-3.13-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%py313_ver%%</param>
     <param name="package">python313-base</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pip_ver%%</param>
     <param name="package">python313-pip</param>

diff --git a/rmt-mariadb-client-image/_service b/rmt-mariadb-client-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb-client</param>

diff --git a/rmt-mariadb-image/_service b/rmt-mariadb-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">docker-entrypoint.sh</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb</param>
     <param name="parse-version">patch</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb</param>