Test build for #1858

.obs/workflows.yml

@@ -73,6 +73,10 @@ staging_build:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: init-image
         target_project: home:defolos:BCI:CR:Tumbleweed:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:Tumbleweed
+        source_package: keadhcp-image
+        target_project: home:defolos:BCI:CR:Tumbleweed:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: kiwi-image
@@ -296,6 +300,9 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: init-image
+    - trigger_services:
+        project: devel:BCI:Tumbleweed
+        package: keadhcp-image
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: kiwi-image

apache-tomcat-10-image/Dockerfile.openjdk22 → apache-tomcat-10-image/Dockerfile.openjdk23

@@ -15,18 +15,17 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22
-#!BuildTag: opensuse/apache-tomcat:latest
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23
+#!BuildTag: opensuse/apache-tomcat:10.1-openjdk23-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10.1-openjdk23
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
 COPY --from=target / /target
 
 RUN set -euo pipefail; \
-    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-22-openjdk java-22-openjdk-headless; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-23-openjdk java-23-openjdk-headless; \
     zypper -n --installroot /target remove util-linux; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -42,13 +41,13 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk23-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk23-%RELEASE%"
 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-10-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%%"

apache-tomcat-10-image/README.openjdk22.md → apache-tomcat-10-image/README.openjdk23.md

@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

apache-tomcat-10-image/_multibuild

@@ -1,5 +1,5 @@
 <multibuild>
     <package>openjdk17</package>
     <package>openjdk21</package>
-    <package>openjdk22</package>
+    <package>openjdk23</package>
 </multibuild>

apache-tomcat-10-image/_service

@@ -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.openjdk23</param>
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>

keadhcp-image/Dockerfile

@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: MPL-2.0
+
+#     Copyright (c) 2024 SUSE LLC
+
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon.
+
+# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
+# It is maintained by the BCI team and generated by
+# https://github.com/SUSE/BCI-dockerfile-generator
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# You can contact the BCI team via https://github.com/SUSE/bci/discussions
+
+#!UseOBSRepositories
+
+#!BuildTag: opensuse/keadhcp:2.6.1-%RELEASE%
+#!BuildTag: opensuse/keadhcp:2.6.1
+#!BuildTag: opensuse/keadhcp:latest
+
+FROM opensuse/tumbleweed:latest
+
+RUN set -euo pipefail; \
+    zypper -n install --no-recommends kea util-linux; \
+    zypper -n clean; \
+    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=org.opensuse.application.keadhcp
+LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed Kea DHCP Server"
+LABEL org.opencontainers.image.description="Kea DHCP Server container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="2.6.1"
+LABEL org.opencontainers.image.url="https://www.opensuse.org"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="openSUSE Project"
+LABEL org.opencontainers.image.source="%SOURCEURL%"
+LABEL org.opencontainers.image.ref.name="2.6.1-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/keadhcp:2.6.1-%RELEASE%"
+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/keadhcp-image/README.md"
+LABEL run="podman run --replace -it --privileged --network=host --name kea-dhcp4 -v /etc/kea:/etc/kea IMAGE kea-dhcp4  -c /etc/kea/kea-dhcp4.conf"
+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
+
+RUN mkdir -p /var/run/kea

keadhcp-image/README.md

@@ -0,0 +1,44 @@
+# Kea DHCP Server container image
+
+![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
+
+ Kea DHCP Server container based on the openSUSE Tumbleweed Base Container Image.
+
+## How to use this container image
+
+The container image expects dhcp configuration file in the path /etc/kea.
+To run dhcp4 for the configuration provided in the directory /etc/kea
+
+```ShellSession
+podman container runlabel run \
+      registry.opensuse.org/opensuse/keadhcp:2.6.1
+```
+To run dhcp6 for the configuration provided in the directory /etc/kea
+
+```ShellSession
+podman container runlabel run_dhcp6 \
+      registry.opensuse.org/opensuse/keadhcp:2.6.1
+```
+
+Dhcp configuration file can also be provided in the current directory.
+To run dhcp4 for the configuration provided in the current directory
+
+```ShellSession
+podman container runlabel runcwd \
+      registry.opensuse.org/opensuse/keadhcp:2.6.1
+```
+To run dhcp6 for the configuration provided in the current directory
+
+```ShellSession
+podman container runlabel runcwd_dhcp6 \
+      registry.opensuse.org/opensuse/keadhcp:2.6.1
+```
+## Licensing
+
+`SPDX-License-Identifier: MPL-2.0`
+
+This documentation and the build recipe are licensed as MPL-2.0.
+The container itself contains various software components under various open source licenses listed in the associated
+Software Bill of Materials (SBOM).
+
+This image is based on [openSUSE Tumbleweed](https://get.opensuse.org/tumbleweed/).

keadhcp-image/_service

@@ -0,0 +1,4 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+</services>

keadhcp-image/keadhcp-image.changes

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Wed Oct 23 10:49:52 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- First version of the Kea DHCP Server 2.6.1 BCI