Test build for #283

SUSE · Jun 27, 2023 · 4f471f6 · 4f471f6
1 parent b0bfa89
commit 4f471f6
Show file tree

Hide file tree

Showing 37 changed files with 105 additions and 28 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -73,6 +73,14 @@ staging_build:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: openjdk-17-image
         target_project: home:defolos:BCI:CR:Tumbleweed:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:Tumbleweed
+        source_package: openjdk-20-devel-image
+        target_project: home:defolos:BCI:CR:Tumbleweed:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:Tumbleweed
+        source_package: openjdk-20-image
+        target_project: home:defolos:BCI:CR:Tumbleweed:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: init-image
@@ -188,6 +196,12 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: openjdk-17-image
+    - trigger_services:
+        project: devel:BCI:Tumbleweed
+        package: openjdk-20-devel-image
+    - trigger_services:
+        project: devel:BCI:Tumbleweed
+        package: openjdk-20-image
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: init-image

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER william.brown@suse.com
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.389-ds
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed 389 Directory Server"
 LABEL org.opencontainers.image.description="389 Directory Server container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.alertmanager
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Alertmanager"
 LABEL org.opencontainers.image.description="Alertmanager container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.blackbox_exporter
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Blackbox Exporter"
 LABEL org.opencontainers.image.description="Blackbox Exporter container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.golang
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.19"
 LABEL org.opencontainers.image.description="Golang 1.19 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -9,7 +9,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.golang
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.20"
 LABEL org.opencontainers.image.description="Golang 1.20 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.grafana
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Grafana"
 LABEL org.opencontainers.image.description="Grafana container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.init
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI openSUSE Tumbleweed Init"
 LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is only supported with podman."

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -10,7 +10,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.nodejs
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 20 development"
 LABEL org.opencontainers.image.description="Node.js 20 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
@@ -6,7 +6,6 @@ FROM opensuse/bci/openjdk:11
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.openjdk.devel
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 11 development"
 LABEL org.opencontainers.image.description="OpenJDK 11 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
@@ -6,7 +6,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.openjdk
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 11 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 11 runtime container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/bci/openjdk:17
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.openjdk.devel
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 17 development"
 LABEL org.opencontainers.image.description="OpenJDK 17 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.openjdk
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 17 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 17 runtime container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/openjdk-20-devel-image/Dockerfile b/openjdk-20-devel-image/Dockerfile
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: opensuse/bci/openjdk-devel:20
+#!BuildTag: opensuse/bci/openjdk-devel:20-%RELEASE%
+
+FROM opensuse/bci/openjdk:20
+
+MAINTAINER openSUSE (https://www.opensuse.org/)
+
+# labelprefix=org.opensuse.bci.openjdk.devel
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 20 development"
+LABEL org.opencontainers.image.description="OpenJDK 20 development container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="20"
+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.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk-devel:20-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
+LABEL org.opensuse.release-stage="released"
+
+# endlabelprefix
+
+RUN set -euo pipefail; zypper -n in --no-recommends java-20-openjdk-devel git-core maven; zypper -n clean; rm -rf /var/log/*
+ENV JAVA_BINDIR="/usr/lib64/jvm/java-20-openjdk-20/bin"
+ENV JAVA_HOME="/usr/lib64/jvm/java-20-openjdk-20"
+ENV JAVA_ROOT="/usr/lib64/jvm/java-20-openjdk-20"
+ENV JAVA_VERSION="20"
+
+CMD ["/usr/bin/jshell"]
+RUN set -euo pipefail; [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]
diff --git a/openjdk-20-devel-image/_constraints b/openjdk-20-devel-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">6</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/openjdk-20-devel-image/_service b/openjdk-20-devel-image/_service
@@ -0,0 +1,4 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+</services>
diff --git a/openjdk-20-devel-image/openjdk-20-devel-image.changes b/openjdk-20-devel-image/openjdk-20-devel-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue Jun 27 13:54:06 UTC 2023 - SUSE Update Bot <bci-internal@suse.de>
+
+- First version of the OpenJDK 20 development BCI
diff --git a/openjdk-20-image/Dockerfile b/openjdk-20-image/Dockerfile
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: opensuse/bci/openjdk:20
+#!BuildTag: opensuse/bci/openjdk:20-%RELEASE%
+
+FROM opensuse/tumbleweed:latest
+
+MAINTAINER openSUSE (https://www.opensuse.org/)
+
+# labelprefix=org.opensuse.bci.openjdk
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 20 runtime"
+LABEL org.opencontainers.image.description="OpenJDK 20 runtime container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="20"
+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.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk:20-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
+LABEL org.opensuse.release-stage="released"
+
+# endlabelprefix
+
+RUN set -euo pipefail; zypper -n in --no-recommends java-20-openjdk; zypper -n clean; rm -rf /var/log/*
+ENV JAVA_BINDIR="/usr/lib64/jvm/java-20-openjdk-20/bin"
+ENV JAVA_HOME="/usr/lib64/jvm/java-20-openjdk-20"
+ENV JAVA_ROOT="/usr/lib64/jvm/java-20-openjdk-20"
+ENV JAVA_VERSION="20"
+
+RUN set -euo pipefail; [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]
diff --git a/openjdk-20-image/_constraints b/openjdk-20-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">6</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/openjdk-20-image/_service b/openjdk-20-image/_service
@@ -0,0 +1,4 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+</services>
diff --git a/openjdk-20-image/openjdk-20-image.changes b/openjdk-20-image/openjdk-20-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue Jun 27 13:54:06 UTC 2023 - SUSE Update Bot <bci-internal@suse.de>
+
+- First version of the OpenJDK 20 runtime BCI
diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -11,7 +11,6 @@ FROM opensuse/bci/bci-init:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.pcp
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Performance Co-Pilot (pcp)"
 LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container image based on the SLE Base Container Image. This container is only supported with podman."

diff --git a/postgres-12-image/Dockerfile b/postgres-12-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 12"
 LABEL org.opencontainers.image.description="PostgreSQL 12 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/postgres-13-image/Dockerfile b/postgres-13-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 13"
 LABEL org.opencontainers.image.description="PostgreSQL 13 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/postgres-14-image/Dockerfile b/postgres-14-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 14"
 LABEL org.opencontainers.image.description="PostgreSQL 14 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
@@ -9,7 +9,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 15"
 LABEL org.opencontainers.image.description="PostgreSQL 15 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/prometheus-image/Dockerfile b/prometheus-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.prometheus
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Prometheus"
 LABEL org.opencontainers.image.description="Prometheus container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/python-3.10-image/Dockerfile b/python-3.10-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.python
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Python 3.10 development"
 LABEL org.opencontainers.image.description="Python 3.10 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
@@ -9,7 +9,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.python
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Python 3.11 development"
 LABEL org.opencontainers.image.description="Python 3.11 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/python-3.9-image/Dockerfile b/python-3.9-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.python
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Python 3.9 development"
 LABEL org.opencontainers.image.description="Python 3.9 development container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rmt-mariadb-client-image/Dockerfile b/rmt-mariadb-client-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.rmt-mariadb-client
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Client for SUSE RMT"
 LABEL org.opencontainers.image.description="MariaDB Client for SUSE RMT container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.rmt-mariadb
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Server for SUSE RMT"
 LABEL org.opencontainers.image.description="MariaDB Server for SUSE RMT container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rmt-nginx-image/Dockerfile b/rmt-nginx-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.rmt-nginx
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed NGINX for SUSE RMT"
 LABEL org.opencontainers.image.description="NGINX for SUSE RMT container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile
@@ -7,7 +7,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.rmt-server
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed SUSE RMT Server"
 LABEL org.opencontainers.image.description="SUSE RMT Server container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/ruby-3.2-image/Dockerfile b/ruby-3.2-image/Dockerfile
@@ -9,7 +9,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.ruby
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Ruby 3.2"
 LABEL org.opencontainers.image.description="Ruby 3.2 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile
@@ -8,7 +8,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.rust
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.69"
 LABEL org.opencontainers.image.description="Rust 1.69 container based on the openSUSE Tumbleweed Base Container Image."

diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
@@ -9,7 +9,6 @@ FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.rust
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Rust 1.70"
 LABEL org.opencontainers.image.description="Rust 1.70 container based on the openSUSE Tumbleweed Base Container Image."