Merge pull request #605 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Sep 5, 2023 · 0e2d36c · 0e2d36c
2 parents 334d26c + 62ab460
commit 0e2d36c
Show file tree

Hide file tree

Showing 91 changed files with 1,183 additions and 20 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -1,6 +1,14 @@
 ---
 staging_build:
   steps:
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: python-3.6-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: python-3.11-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP6
         source_package: 389-ds-container
@@ -41,6 +49,26 @@ staging_build:
         source_project: home:defolos:BCI:CR:SLE-15-SP6
         source_package: git-image
         target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: golang-oldstable-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: golang-stable-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: golang-oldstable-openssl-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: golang-stable-openssl-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: ruby-2.5-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP6
         source_package: openjdk-11-devel-image
@@ -57,6 +85,18 @@ staging_build:
         source_project: home:defolos:BCI:CR:SLE-15-SP6
         source_package: openjdk-17-image
         target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: php8-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: php-apache8-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
+    - branch_package:
+        source_project: home:defolos:BCI:CR:SLE-15-SP6
+        source_package: php-fpm8-image
+        target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:SLE-15-SP6
         source_package: init-image
@@ -110,6 +150,12 @@ staging_build:
 
 refresh_devel_BCI:
   steps:
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: python-3.6-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: python-3.11-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP6
         package: 389-ds-container
@@ -140,6 +186,21 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:SLE-15-SP6
         package: git-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: golang-oldstable-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: golang-stable-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: golang-oldstable-openssl-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: golang-stable-openssl-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: ruby-2.5-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP6
         package: openjdk-11-devel-image
@@ -152,6 +213,15 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:SLE-15-SP6
         package: openjdk-17-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: php8-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: php-apache8-image
+    - trigger_services:
+        project: devel:BCI:SLE-15-SP6
+        package: php-fpm8-image
     - trigger_services:
         project: devel:BCI:SLE-15-SP6
         package: init-image

diff --git a/389-ds-container/389-ds-container.changes b/389-ds-container/389-ds-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  5 11:29:30 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Readd buildversion tags
+
 -------------------------------------------------------------------
 Sat Aug 26 09:37:08 UTC 2023 - SUSE Update Bot <[email protected]>
 

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: suse/389-ds:%%389ds_version%%
 #!BuildTag: suse/389-ds:%%389ds_version%%-%RELEASE%
-
+#!BuildVersion: 15.6
 FROM suse/sle15:15.6
 
 MAINTAINER [email protected]

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: suse/alertmanager:%%alertmanager_version%%
 #!BuildTag: suse/alertmanager:%%alertmanager_version%%-%RELEASE%
-
+#!BuildVersion: 15.6
 FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)

diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  5 11:29:30 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Readd buildversion tags
+
 -------------------------------------------------------------------
 Sat Aug 26 09:37:08 UTC 2023 - SUSE Update Bot <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_version%%
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_version%%-%RELEASE%
-
+#!BuildVersion: 15.6
 FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)

diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  5 11:29:30 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Readd buildversion tags
+
 -------------------------------------------------------------------
 Sat Aug 26 09:37:08 UTC 2023 - SUSE Update Bot <[email protected]>
 

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: bci/golang:oldstable
+#!BuildTag: bci/golang:oldstable-2.%RELEASE%
+#!BuildTag: bci/golang:1.20
+#!BuildTag: bci/golang:1.20-2.%RELEASE%
+#!BuildVersion: 15.6.1.20
+FROM suse/sle15:15.6
+
+MAINTAINER SUSE LLC (https://www.suse.com/)
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.bci.golang
+LABEL org.opencontainers.image.title="SLE BCI Golang 1.20"
+LABEL org.opencontainers.image.description="Golang 1.20 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.20"
+LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opencontainers.image.source="%SOURCEURL%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.20-2.%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="l3"
+LABEL com.suse.eula="sle-bci"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
+LABEL com.suse.image-type="sle-bci"
+LABEL com.suse.release-stage="beta"
+# endlabelprefix
+
+RUN set -euo pipefail; zypper -n in --no-recommends go1.20 go1.20-doc go1.20-race make git-core; zypper -n clean; rm -rf /var/log/*
+ENV GOLANG_VERSION="%%golang_version%%"
+ENV GOPATH="/go"
+ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
diff --git a/golang-oldstable-image/_constraints b/golang-oldstable-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">8</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/golang-oldstable-image/_service b/golang-oldstable-image/_service
@@ -0,0 +1,9 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%golang_version%%</param>
+    <param name="package">go1.20</param>
+  </service>
+</services>
diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
@@ -0,0 +1,54 @@
+-------------------------------------------------------------------
+Tue Sep  5 11:29:30 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Readd buildversion tags
+
+-------------------------------------------------------------------
+Wed Jul 12 12:58:24 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Remove distribution-release from the package list, it is inherited from the base image
+
+-------------------------------------------------------------------
+Tue Jun 27 15:55:54 UTC 2023 - Dan Čermák <[email protected]>
+
+- Fix reference label
+
+-------------------------------------------------------------------
+Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller <[email protected]>
+
+- label capitalization and other cleanups
+
+-------------------------------------------------------------------
+Thu Jun 22 16:57:03 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Order the stability buildtag first in the list and prefix them with an stability index to avoid overlaps
+
+-------------------------------------------------------------------
+Thu Jun 15 13:44:18 UTC 2023 - Dan Čermák <[email protected]>
+
+- Set BuildVersion so that containers sort higher than those from SP4
+
+-------------------------------------------------------------------
+Tue Jun 13 15:45:53 UTC 2023 - Dan Čermák <[email protected]>
+
+- Mark SP5 based containers as released
+
+-------------------------------------------------------------------
+Tue Jun 13 14:41:37 UTC 2023 - Dirk Müller <[email protected]>
+
+- rename to oldstable
+
+-------------------------------------------------------------------
+Tue May 30 06:51:30 UTC 2023 - Dan Čermák <[email protected]>
+
+- Fix lifecycle url
+
+-------------------------------------------------------------------
+Fri Mar  3 07:27:34 UTC 2023 - Dan Čermák <[email protected]>
+
+- Add org.opencontainers.image.source label set to %SOURCEURL%
+
+-------------------------------------------------------------------
+Thu Nov 24 10:52:58 UTC 2022 - Dan Čermák <[email protected]>
+
+- Branch container from SLE 15 SP4
diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: bci/golang:oldstable-openssl
+#!BuildTag: bci/golang:oldstable-openssl-%RELEASE%
+#!BuildTag: bci/golang:1.19-openssl
+#!BuildTag: bci/golang:1.19-openssl-%RELEASE%
+#!BuildVersion: 15.6
+FROM suse/sle15:15.6
+
+MAINTAINER SUSE LLC (https://www.suse.com/)
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.bci.golang
+LABEL org.opencontainers.image.title="SLE BCI Golang 1.19-openssl"
+LABEL org.opencontainers.image.description="Golang 1.19-openssl container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.19-openssl"
+LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opencontainers.image.source="%SOURCEURL%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.19-openssl-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="l3"
+LABEL com.suse.eula="sle-bci"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
+LABEL com.suse.image-type="sle-bci"
+LABEL com.suse.release-stage="beta"
+# endlabelprefix
+
+RUN set -euo pipefail; zypper -n in --no-recommends go1.19-openssl go1.19-openssl-doc go1.19-openssl-race make git-core; zypper -n clean; rm -rf /var/log/*
+ENV GOLANG_VERSION="%%golang_version%%"
+ENV GOPATH="/go"
+ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
diff --git a/golang-oldstable-openssl-image/_constraints b/golang-oldstable-openssl-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">8</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/golang-oldstable-openssl-image/_service b/golang-oldstable-openssl-image/_service
@@ -0,0 +1,9 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%golang_version%%</param>
+    <param name="package">go1.19-openssl</param>
+  </service>
+</services>
diff --git a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
@@ -0,0 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep  5 11:29:30 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Readd buildversion tags
+
+-------------------------------------------------------------------
+Wed Jul 12 12:58:24 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Remove distribution-release from the package list, it is inherited from the base image
+
+-------------------------------------------------------------------
+Thu Jul 06 20:35:56 UTC 2023 - SUSE Update Bot <[email protected]>
+
+- First version of the Golang 1.19-openssl BCI
diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: bci/golang:stable
+#!BuildTag: bci/golang:stable-1.%RELEASE%
+#!BuildTag: bci/golang:1.21
+#!BuildTag: bci/golang:1.21-1.%RELEASE%
+#!BuildVersion: 15.6.1.21
+FROM suse/sle15:15.6
+
+MAINTAINER SUSE LLC (https://www.suse.com/)
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.bci.golang
+LABEL org.opencontainers.image.title="SLE BCI Golang 1.21"
+LABEL org.opencontainers.image.description="Golang 1.21 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.21"
+LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opencontainers.image.source="%SOURCEURL%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.21-1.%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="l3"
+LABEL com.suse.eula="sle-bci"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
+LABEL com.suse.image-type="sle-bci"
+LABEL com.suse.release-stage="beta"
+# endlabelprefix
+
+RUN set -euo pipefail; zypper -n in --no-recommends go1.21 go1.21-doc go1.21-race make git-core; zypper -n clean; rm -rf /var/log/*
+ENV GOLANG_VERSION="%%golang_version%%"
+ENV GOPATH="/go"
+ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
diff --git a/golang-stable-image/_constraints b/golang-stable-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">8</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/golang-stable-image/_service b/golang-stable-image/_service
@@ -0,0 +1,9 @@
+<services>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%golang_version%%</param>
+    <param name="package">go1.21</param>
+  </service>
+</services>