From 9451ce73206b66af487713d3fd9fc7b1dfa567d6 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Mon, 2 Jan 2023 10:48:03 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- golang-1.18/config.sh | 2 +- init/config.sh | 2 +- micro/config.sh | 2 +- minimal/config.sh | 2 +- nodejs-14/config.sh | 2 +- nodejs-16/config.sh | 2 +- openjdk-11-devel/config.sh | 2 +- openjdk-11/config.sh | 2 +- pcp-image/Dockerfile | 4 +++- python-3.6/config.sh | 2 +- python-3.6/python-3.6.kiwi | 4 ++-- python-3.9/config.sh | 2 +- python-3.9/python-3.9.kiwi | 4 ++-- ruby-2.5-image/config.sh | 2 +- ruby-2.5-image/ruby-2.5-image.kiwi | 4 ++-- 15 files changed, 20 insertions(+), 18 deletions(-) diff --git a/golang-1.18/config.sh b/golang-1.18/config.sh index 2430ed3eb..531a4e200 100644 --- 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/init/config.sh b/init/config.sh index cb4bc4c84..c4c90bd34 100644 --- 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/micro/config.sh b/micro/config.sh index 624c732ac..cb89a0880 100644 --- 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/minimal/config.sh b/minimal/config.sh index 2430ed3eb..531a4e200 100644 --- 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/nodejs-14/config.sh b/nodejs-14/config.sh index 2430ed3eb..531a4e200 100644 --- 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-16/config.sh b/nodejs-16/config.sh index 2430ed3eb..531a4e200 100644 --- 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/openjdk-11-devel/config.sh b/openjdk-11-devel/config.sh index 2430ed3eb..531a4e200 100644 --- 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/config.sh b/openjdk-11/config.sh index 2430ed3eb..531a4e200 100644 --- 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/pcp-image/Dockerfile b/pcp-image/Dockerfile index 68bd00187..11f97d564 100644 --- 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/python-3.6/config.sh b/python-3.6/config.sh index 2430ed3eb..531a4e200 100644 --- 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.kiwi b/python-3.6/python-3.6.kiwi index b0cf43d98..768fde94a 100644 --- a/python-3.6/python-3.6.kiwi +++ b/python-3.6/python-3.6.kiwi @@ -1,7 +1,7 @@ - + @@ -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%"> diff --git a/python-3.9/config.sh b/python-3.9/config.sh index ac81c7205..7b823ef7d 100644 --- 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.kiwi b/python-3.9/python-3.9.kiwi index 3deb2b073..1e5771ed8 100644 --- a/python-3.9/python-3.9.kiwi +++ b/python-3.9/python-3.9.kiwi @@ -1,7 +1,7 @@ - + @@ -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%"> diff --git a/ruby-2.5-image/config.sh b/ruby-2.5-image/config.sh index e3999add7..a0adde519 100644 --- 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.kiwi b/ruby-2.5-image/ruby-2.5-image.kiwi index 452189a71..d1503b1ae 100644 --- a/ruby-2.5-image/ruby-2.5-image.kiwi +++ b/ruby-2.5-image/ruby-2.5-image.kiwi @@ -1,7 +1,7 @@ - + @@ -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%"> From 0ce9133454fcafc4aaa653843d4e67dd0a6be7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 2 Jan 2023 13:42:31 +0000 Subject: [PATCH 2/4] Update changelogs for golang-1.18, init, micro, minimal, nodejs-14, nodejs-16, openjdk-11-devel, openjdk-11 --- golang-1.18/golang-1.18.changes | 5 +++++ init/init.changes | 5 +++++ micro/micro.changes | 5 +++++ minimal/minimal.changes | 5 +++++ nodejs-14/nodejs-14.changes | 5 +++++ nodejs-16/nodejs-16.changes | 5 +++++ openjdk-11-devel/openjdk-11-devel.changes | 5 +++++ openjdk-11/openjdk-11.changes | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/golang-1.18/golang-1.18.changes b/golang-1.18/golang-1.18.changes index 8cea0f113..b9a6473db 100644 --- 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 + +- Bump copyright year + ------------------------------------------------------------------- Wed Nov 23 10:09:54 UTC 2022 - Dan Čermák diff --git a/init/init.changes b/init/init.changes index a1af14e94..310d09d56 100644 --- a/init/init.changes +++ b/init/init.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák + +- Bump copyright year + ------------------------------------------------------------------- Wed Oct 19 12:24:33 UTC 2022 - Bruno Leon diff --git a/micro/micro.changes b/micro/micro.changes index 41ca6be33..dd6bb2d23 100644 --- a/micro/micro.changes +++ b/micro/micro.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák + +- Bump copyright year + ------------------------------------------------------------------- Wed Oct 19 12:26:13 UTC 2022 - Bruno Leon diff --git a/minimal/minimal.changes b/minimal/minimal.changes index c56d76e2a..58ca1b82b 100644 --- a/minimal/minimal.changes +++ b/minimal/minimal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák + +- Bump copyright year + ------------------------------------------------------------------- Wed Oct 19 12:26:06 UTC 2022 - Bruno Leon diff --git a/nodejs-14/nodejs-14.changes b/nodejs-14/nodejs-14.changes index 7f495eb64..1dfb0c815 100644 --- 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 + +- Bump copyright year + ------------------------------------------------------------------- Wed Nov 23 10:25:21 UTC 2022 - Dan Čermák diff --git a/nodejs-16/nodejs-16.changes b/nodejs-16/nodejs-16.changes index 871c054e3..d6db96624 100644 --- 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 + +- Bump copyright year + ------------------------------------------------------------------- Wed Nov 23 10:08:50 UTC 2022 - Dan Čermák diff --git a/openjdk-11-devel/openjdk-11-devel.changes b/openjdk-11-devel/openjdk-11-devel.changes index 5ab04cee6..91cbffee5 100644 --- 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 + +- Bump copyright year + ------------------------------------------------------------------- Wed Dec 7 15:13:03 UTC 2022 - Dan Čermák diff --git a/openjdk-11/openjdk-11.changes b/openjdk-11/openjdk-11.changes index c824d70f4..4d6fe1561 100644 --- 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 + +- Bump copyright year + ------------------------------------------------------------------- Wed Dec 7 15:13:03 UTC 2022 - Dan Čermák From b5d313ff18192923cab34b6eb03848fa5684b25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 2 Jan 2023 13:57:46 +0000 Subject: [PATCH 3/4] Update changelog for pcp-image --- pcp-image/pcp-image.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes index fd64ee186..dde87d90c 100644 --- 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 + +- Add additional -%RELEASE% build tags and handle non-existent wicked gracefully + ------------------------------------------------------------------- Mon Sep 26 14:52:05 UTC 2022 - Dan Čermák From 498c89a6bf71edd18ed7a6812a3b9370d0d07b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 2 Jan 2023 13:59:40 +0000 Subject: [PATCH 4/4] Update changelogs for python-3.6, python-3.9, ruby-2.5-image --- python-3.6/python-3.6.changes | 5 +++++ python-3.9/python-3.9.changes | 5 +++++ ruby-2.5-image/ruby-2.5-image.changes | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/python-3.6/python-3.6.changes b/python-3.6/python-3.6.changes index a554c56e0..e471f85d6 100644 --- 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 + +- Bump copyright year & add -%RELEASE% build tags + ------------------------------------------------------------------- Tue Nov 29 12:33:21 UTC 2022 - Dan Čermák diff --git a/python-3.9/python-3.9.changes b/python-3.9/python-3.9.changes index 3f1164933..bc646861e 100644 --- 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 + +- Bump copyright year & add -%RELEASE% build tags + ------------------------------------------------------------------- Tue Nov 29 12:33:21 UTC 2022 - Dan Čermák diff --git a/ruby-2.5-image/ruby-2.5-image.changes b/ruby-2.5-image/ruby-2.5-image.changes index 2da74b9e3..dd61a163a 100644 --- 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 + +- Bump copyright year & add -%RELEASE% build tags + ------------------------------------------------------------------- Mon Sep 26 14:52:22 UTC 2022 - Dan Čermák