Merge pull request #193 from SUSE/for-deploy-3

🤖: Update build recipes for SP3
SUSE · Jan 2, 2023 · 9c56c01 · 9c56c01
2 parents dae7a64 + 498c89a
commit 9c56c01
Show file tree

Hide file tree

Showing 27 changed files with 80 additions and 18 deletions.
diff --git a/golang-1.18/config.sh b/golang-1.18/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/golang-1.18/golang-1.18.changes b/golang-1.18/golang-1.18.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Nov 23 10:09:54 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/init/config.sh b/init/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/init/init.changes b/init/init.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Oct 19 12:24:33 UTC 2022 - Bruno Leon <[email protected]>
 

diff --git a/micro/config.sh b/micro/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/micro/micro.changes b/micro/micro.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Oct 19 12:26:13 UTC 2022 - Bruno Leon <[email protected]>
 

diff --git a/minimal/config.sh b/minimal/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/minimal/minimal.changes b/minimal/minimal.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Oct 19 12:26:06 UTC 2022 - Bruno Leon <[email protected]>
 

diff --git a/nodejs-14/config.sh b/nodejs-14/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/nodejs-14/nodejs-14.changes b/nodejs-14/nodejs-14.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Nov 23 10:25:21 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/nodejs-16/config.sh b/nodejs-16/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/nodejs-16/nodejs-16.changes b/nodejs-16/nodejs-16.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Nov 23 10:08:50 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/openjdk-11-devel/config.sh b/openjdk-11-devel/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/openjdk-11-devel/openjdk-11-devel.changes b/openjdk-11-devel/openjdk-11-devel.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Dec  7 15:13:03 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/openjdk-11/config.sh b/openjdk-11/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/openjdk-11/openjdk-11.changes b/openjdk-11/openjdk-11.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:42:31 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Wed Dec  7 15:13:03 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -2,7 +2,9 @@
 #!BuildTag: suse/pcp:%%pcp_patch%%
 #!BuildTag: suse/pcp:%%pcp_patch%%-%RELEASE%
 #!BuildTag: suse/pcp:%%pcp_minor%%
+#!BuildTag: suse/pcp:%%pcp_minor%%-%RELEASE%
 #!BuildTag: suse/pcp:%%pcp_major%%
+#!BuildTag: suse/pcp:%%pcp_major%%-%RELEASE%
 
 FROM bci/bci-init:15.3
 
@@ -38,6 +40,6 @@ COPY pmproxy.conf.template 10-host_mount.conf.template /usr/share/container-scri
 COPY pmcd pmlogger /etc/sysconfig/
 
 # This can be removed after the pcp dependency on sysconfig is removed
-RUN set -euo pipefail; systemctl disable wicked wickedd
+RUN set -euo pipefail; systemctl disable wicked wickedd || :
 
 HEALTHCHECK --start-period=30s --timeout=20s --interval=10s --retries=3     CMD /usr/local/bin/healthcheck
diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:57:46 UTC 2023 - Dan Čermák <[email protected]>
+
+- Add additional -%RELEASE% build tags and handle non-existent wicked gracefully
+
 -------------------------------------------------------------------
 Mon Sep 26 14:52:05 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/python-3.6/config.sh b/python-3.6/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/python-3.6/python-3.6.changes b/python-3.6/python-3.6.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:59:40 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year & add -%RELEASE% build tags
+
 -------------------------------------------------------------------
 Tue Nov 29 12:33:21 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/python-3.6/python-3.6.kiwi b/python-3.6/python-3.6.kiwi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/python:3.6 bci/python:3.6-%RELEASE% bci/python:3 -->
+<!-- OBS-AddTag: bci/python:3.6 bci/python:3.6-%RELEASE% bci/python:3 bci/python:3-%RELEASE% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="python-3.6-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -16,7 +16,7 @@
           name="bci/python"
           tag="3.6"
           maintainer="SUSE LLC (https://www.suse.com/)"
-          additionaltags="3.6-%RELEASE%,3">
+          additionaltags="3.6-%RELEASE%,3,3-%RELEASE%">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="com.suse.bci.python">

diff --git a/python-3.9/config.sh b/python-3.9/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/python-3.9/python-3.9.changes b/python-3.9/python-3.9.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:59:40 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year & add -%RELEASE% build tags
+
 -------------------------------------------------------------------
 Tue Nov 29 12:33:21 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/python-3.9/python-3.9.kiwi b/python-3.9/python-3.9.kiwi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/python:3.9 bci/python:3.9-%RELEASE% bci/python:3 -->
+<!-- OBS-AddTag: bci/python:3.9 bci/python:3.9-%RELEASE% bci/python:3 bci/python:3-%RELEASE% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="python-3.9-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -16,7 +16,7 @@
           name="bci/python"
           tag="3.9"
           maintainer="SUSE LLC (https://www.suse.com/)"
-          additionaltags="3.9-%RELEASE%,3">
+          additionaltags="3.9-%RELEASE%,3,3-%RELEASE%">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="com.suse.bci.python">

diff --git a/ruby-2.5-image/config.sh b/ruby-2.5-image/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

diff --git a/ruby-2.5-image/ruby-2.5-image.changes b/ruby-2.5-image/ruby-2.5-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 13:59:40 UTC 2023 - Dan Čermák <[email protected]>
+
+- Bump copyright year & add -%RELEASE% build tags
+
 -------------------------------------------------------------------
 Mon Sep 26 14:52:22 UTC 2022 - Dan Čermák <[email protected]>
 

diff --git a/ruby-2.5-image/ruby-2.5-image.kiwi b/ruby-2.5-image/ruby-2.5-image.kiwi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/ruby:2.5 bci/ruby:2.5-%RELEASE% bci/ruby:2 -->
+<!-- OBS-AddTag: bci/ruby:2.5 bci/ruby:2.5-%RELEASE% bci/ruby:2 bci/ruby:2-%RELEASE% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="ruby-2.5-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -16,7 +16,7 @@
           name="bci/ruby"
           tag="2.5"
           maintainer="SUSE LLC (https://www.suse.com/)"
-          additionaltags="2.5-%RELEASE%,2">
+          additionaltags="2.5-%RELEASE%,2,2-%RELEASE%">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="com.suse.bci.ruby">