From 52fe3b5b3aa545b44c6baf1c4aaf6e0da0f37dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 7 May 2024 12:40:21 +0000 Subject: [PATCH] Test build for #1092 --- .obs/workflows.yml | 68 +--- busybox-image/_service | 4 - busybox-image/busybox-image.changes | 111 ------ busybox-image/busybox-image.kiwi | 69 ---- busybox-image/config.sh | 34 -- init-image/Dockerfile | 51 --- init-image/_service | 4 - init-image/init-image.changes | 151 -------- micro-image/_service | 4 - micro-image/config.sh | 31 -- micro-image/micro-image.changes | 120 ------ micro-image/micro-image.kiwi | 69 ---- minimal-image/_service | 4 - minimal-image/config.sh | 37 -- minimal-image/minimal-image.changes | 124 ------- minimal-image/minimal-image.kiwi | 74 ---- nodejs-16-image/Dockerfile | 48 --- nodejs-16-image/_service | 4 - nodejs-16-image/nodejs-16-image.changes | 126 ------- postgres-14-image/Dockerfile | 66 ---- postgres-14-image/LICENSE | 22 -- postgres-14-image/_constraints | 7 - postgres-14-image/_service | 10 - postgres-14-image/docker-entrypoint.sh | 351 ------------------ postgres-14-image/postgres-14-image.changes | 187 ---------- python-3.10-image/Dockerfile | 52 --- python-3.10-image/_service | 14 - python-3.10-image/python-3.10-image.changes | 119 ------ sle15-kernel-module-devel-image/Dockerfile | 43 --- sle15-kernel-module-devel-image/_constraints | 7 - sle15-kernel-module-devel-image/_service | 4 - .../sle15-kernel-module-devel-image.changes | 4 - 32 files changed, 12 insertions(+), 2007 deletions(-) delete mode 100644 busybox-image/_service delete mode 100644 busybox-image/busybox-image.changes delete mode 100644 busybox-image/busybox-image.kiwi delete mode 100644 busybox-image/config.sh delete mode 100644 init-image/Dockerfile delete mode 100644 init-image/_service delete mode 100644 init-image/init-image.changes delete mode 100644 micro-image/_service delete mode 100644 micro-image/config.sh delete mode 100644 micro-image/micro-image.changes delete mode 100644 micro-image/micro-image.kiwi delete mode 100644 minimal-image/_service delete mode 100644 minimal-image/config.sh delete mode 100644 minimal-image/minimal-image.changes delete mode 100644 minimal-image/minimal-image.kiwi delete mode 100644 nodejs-16-image/Dockerfile delete mode 100644 nodejs-16-image/_service delete mode 100644 nodejs-16-image/nodejs-16-image.changes delete mode 100644 postgres-14-image/Dockerfile delete mode 100644 postgres-14-image/LICENSE delete mode 100644 postgres-14-image/_constraints delete mode 100644 postgres-14-image/_service delete mode 100644 postgres-14-image/docker-entrypoint.sh delete mode 100644 postgres-14-image/postgres-14-image.changes delete mode 100644 python-3.10-image/Dockerfile delete mode 100644 python-3.10-image/_service delete mode 100644 python-3.10-image/python-3.10-image.changes delete mode 100644 sle15-kernel-module-devel-image/Dockerfile delete mode 100644 sle15-kernel-module-devel-image/_constraints delete mode 100644 sle15-kernel-module-devel-image/_service delete mode 100644 sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes diff --git a/.obs/workflows.yml b/.obs/workflows.yml index d999d57af..aa8b9853d 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -1,67 +1,23 @@ --- staging_build: steps: - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: python-3.10-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: nodejs-16-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: init-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: postgres-14-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: minimal-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: micro-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: busybox-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP4 - source_package: sle15-kernel-module-devel-image - target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging filters: event: pull_request -refresh_devel_BCI: +refresh_staging_project: steps: - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: python-3.10-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: nodejs-16-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: init-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: postgres-14-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: minimal-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: micro-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: busybox-image - - trigger_services: - project: devel:BCI:SLE-15-SP4 - package: sle15-kernel-module-devel-image + project: home:defolos:BCI:CR:SLE-15-SP4 + package: _project + filters: + event: push + branches: + only: + - sle15-sp4 + + +refresh_devel_BCI: + steps: filters: event: push branches: diff --git a/busybox-image/_service b/busybox-image/_service deleted file mode 100644 index bd1abb02d..000000000 --- a/busybox-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes deleted file mode 100644 index 7feeeabfa..000000000 --- a/busybox-image/busybox-image.changes +++ /dev/null @@ -1,111 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Wed Jul 12 12:35:49 UTC 2023 - Dirk Mueller - -- Replace distribution-release with sles-release - -------------------------------------------------------------------- -Mon Jun 26 20:57:19 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue Jun 20 14:51:59 UTC 2023 - Dirk Mueller - -- Remove latest tags - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Tue Apr 25 22:23:07 UTC 2023 - Dirk Mueller - -- Reduce busybox image size by removing Index.db - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Mon Jan 2 10:50:06 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 11:16:23 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:54:32 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 16 10:09:08 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:53:15 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:18:40 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 13:03:19 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Thu Apr 28 10:22:13 UTC 2022 - Dan Čermák - -- fix default shell of root to sh instead of bash - -------------------------------------------------------------------- -Fri Apr 22 08:17:30 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:15:34 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 09:01:15 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Tue Mar 8 07:36:11 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42), Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this - -------------------------------------------------------------------- -Fri Feb 25 14:53:01 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 13:29:54 UTC 2022 - Dan Čermák - -- Update image description to use the latest state from SLE -- Update the labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Mon Oct 25 13:17:11 UTC 2021 - Dan Čermák - -- First version of the busybox BCI container - diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi deleted file mode 100644 index 9ac3fdc9b..000000000 --- a/busybox-image/busybox-image.kiwi +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI 15 SP4 BusyBox Container Image - - - - - - - - - - - - 15.4.0 - zypper - false - true - - - - - - - - - - - - \ No newline at end of file diff --git a/busybox-image/config.sh b/busybox-image/config.sh deleted file mode 100644 index f3d99f464..000000000 --- a/busybox-image/config.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC - -set -euo pipefail - -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -echo "Configure image: [$kiwi_iname]..." - -#============================================ -# Import repositories' keys if rpm is present -#-------------------------------------------- -if command -v rpm > /dev/null; then - suseImportBuildKey -fi - - -sed -i 's|/bin/bash|/bin/sh|' /etc/passwd -# Will be recreated by the next rpm(1) run as root user -rm -v /usr/lib/sysimage/rpm/Index.db - - -#======================================= -# Clean up after zypper if it is present -#--------------------------------------- -if command -v zypper > /dev/null; then - zypper -n clean -fi - -rm -rf /var/log/zypp - -exit 0 diff --git a/init-image/Dockerfile b/init-image/Dockerfile deleted file mode 100644 index 4d8504cd9..000000000 --- a/init-image/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2023 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 - - -#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP% -#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE% -#!BuildName: bci-bci-init-%OS_VERSION_ID_SP% -#!BuildVersion: 15.4 -FROM suse/sle15:15.4 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.bci.init -LABEL org.opencontainers.image.title="SLE BCI 15 SP4 Init" -LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is only supported with podman." -LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%" -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/bci-init:%OS_VERSION_ID_SP%.%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="released" -# endlabelprefix -LABEL usage="This container should only be used to build containers for daemons. Add your packages and enable services using systemctl." - -RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip; zypper -n clean; rm -rf /var/log/* -CMD ["/usr/lib/systemd/systemd"] - -RUN mkdir -p /etc/systemd/system.conf.d/ && \ - printf "[Manager]\nLogColor=no" > \ - /etc/systemd/system.conf.d/01-sle-bci-nocolor.conf -RUN systemctl disable getty@tty1.service -HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"] diff --git a/init-image/_service b/init-image/_service deleted file mode 100644 index 053a4f4f8..000000000 --- a/init-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/init-image/init-image.changes b/init-image/init-image.changes deleted file mode 100644 index 862418918..000000000 --- a/init-image/init-image.changes +++ /dev/null @@ -1,151 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Fri Sep 22 09:32:37 UTC 2023 - Dirk Mueller - -- add buildname when buildversion is set otherwise OBS ignores it - -------------------------------------------------------------------- -Mon Jun 26 20:57:19 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue Jun 20 14:51:59 UTC 2023 - Dirk Mueller - -- Remove latest tags - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Thu Jan 12 07:49:55 UTC 2023 - Dirk Mueller - -- Disable systemd colors - -------------------------------------------------------------------- -Wed Oct 19 12:20:53 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:53:37 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 30 11:58:55 UTC 2022 - Dan Čermák - -- Disable getty@tty1.service, fixes bsc#1198102 - -------------------------------------------------------------------- -Tue Aug 16 10:08:23 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Tue Aug 9 09:58:42 UTC 2022 - Dan Čermák - -- Set BuildVersion to 15.4 - -------------------------------------------------------------------- -Thu Jul 7 14:53:21 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:18:47 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 13:01:53 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Fri Jun 17 09:00:47 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue Jun 14 12:22:50 UTC 2022 - Dan Čermák - -- Add HEALTHCHECK - -------------------------------------------------------------------- -Tue May 3 09:25:39 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:16:01 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:14:28 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:59:59 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Wed Mar 16 13:09:42 UTC 2022 - Dan Čermák - -- Fix quotes in CMD and ENTRYPOINT - -------------------------------------------------------------------- -Tue Mar 8 07:34:58 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) -- Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this -- Include statement about only supporting podman - -------------------------------------------------------------------- -Fri Feb 25 14:51:32 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 23 15:12:04 UTC 2022 - Dan Čermák - -- Correct ENTRYPOINT to CMD, use a syntax that does not break podman - -------------------------------------------------------------------- -Tue Feb 15 09:58:46 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Tue Feb 8 16:02:51 UTC 2022 - Dan Čermák - -- Update labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Jan 11 14:25:44 UTC 2022 - Dan Čermák - -- Add %OS_VERSION_ID_SP% label and cleanup /var/log - -------------------------------------------------------------------- -Thu Dec 16 10:10:33 UTC 2021 - Dan Čermák - -- Fix reference - -------------------------------------------------------------------- -Fri Dec 10 15:34:49 UTC 2021 - Dan Čermák - -- First version of the init container for 15SP4 diff --git a/micro-image/_service b/micro-image/_service deleted file mode 100644 index bd1abb02d..000000000 --- a/micro-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/micro-image/config.sh b/micro-image/config.sh deleted file mode 100644 index cb89a0880..000000000 --- a/micro-image/config.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC - -set -euo pipefail - -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -echo "Configure image: [$kiwi_iname]..." - -#============================================ -# Import repositories' keys if rpm is present -#-------------------------------------------- -if command -v rpm > /dev/null; then - suseImportBuildKey -fi - - - - -#======================================= -# Clean up after zypper if it is present -#--------------------------------------- -if command -v zypper > /dev/null; then - zypper -n clean -fi - -rm -rf /var/log/zypp - -exit 0 diff --git a/micro-image/micro-image.changes b/micro-image/micro-image.changes deleted file mode 100644 index 22801f8f4..000000000 --- a/micro-image/micro-image.changes +++ /dev/null @@ -1,120 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Wed Jul 12 12:35:49 UTC 2023 - Dirk Mueller - -- Replace distribution-release with sles-release - -------------------------------------------------------------------- -Mon Jun 26 20:57:19 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue Jun 20 14:51:59 UTC 2023 - Dirk Mueller - -- Remove latest tags - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Mon Jan 2 10:50:06 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 11:16:16 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:54:27 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 16 10:09:01 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:53:08 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:18:33 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 13:03:09 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Fri Jun 17 09:01:27 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Wed May 25 13:21:37 UTC 2022 - Bruno Leon - -- Add BCI EULA to bci-micro - -------------------------------------------------------------------- -Thu Apr 28 10:10:43 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is not present in the image -- Add coreutils package to ensure no dependency conflicts occur - -------------------------------------------------------------------- -Fri Apr 22 08:17:20 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:15:27 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 09:01:07 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Tue Mar 8 07:36:03 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42), Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this - -------------------------------------------------------------------- -Fri Feb 25 14:52:52 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:59:45 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Tue Feb 8 16:03:48 UTC 2022 - Dan Čermák - -- Update labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Dec 1 14:46:34 UTC 2021 - Dan Čermák - -- Initial version of the BCI micro container diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi deleted file mode 100644 index 8aa891cd1..000000000 --- a/micro-image/micro-image.kiwi +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI 15 SP4 Micro Container Image - - - - - - - - - - - 15.4.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/minimal-image/_service b/minimal-image/_service deleted file mode 100644 index bd1abb02d..000000000 --- a/minimal-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/minimal-image/config.sh b/minimal-image/config.sh deleted file mode 100644 index 1ac14a0c6..000000000 --- a/minimal-image/config.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC - -set -euo pipefail - -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -echo "Configure image: [$kiwi_iname]..." - -#============================================ -# Import repositories' keys if rpm is present -#-------------------------------------------- -if command -v rpm > /dev/null; then - suseImportBuildKey -fi - - -#========================================== -# Remove compat-usrmerge-tools if installed -#------------------------------------------ -if rpm -q compat-usrmerge-tools; then - rpm -e compat-usrmerge-tools -fi - - -#======================================= -# Clean up after zypper if it is present -#--------------------------------------- -if command -v zypper > /dev/null; then - zypper -n clean -fi - -rm -rf /var/log/zypp - -exit 0 diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes deleted file mode 100644 index 84ceacf36..000000000 --- a/minimal-image/minimal-image.changes +++ /dev/null @@ -1,124 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Wed Aug 9 14:54:36 UTC 2023 - Dirk Mueller - -- Remove unnecessary usrmerge compat package - -------------------------------------------------------------------- -Wed Jul 12 12:35:49 UTC 2023 - Dirk Mueller - -- Replace distribution-release with sles-release - -------------------------------------------------------------------- -Mon Jun 26 20:57:19 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue Jun 20 14:51:59 UTC 2023 - Dirk Mueller - -- Remove latest tags - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Mon Jan 2 10:50:06 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 11:16:08 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:54:22 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 16 10:08:53 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:53:02 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:18:27 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 13:03:01 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Fri Jun 17 09:01:21 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Thu Apr 28 10:10:50 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is not present in the image - -------------------------------------------------------------------- -Fri Apr 22 08:17:10 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:15:20 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 09:00:59 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Tue Mar 8 07:35:54 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42), Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this - -------------------------------------------------------------------- -Fri Feb 25 14:52:36 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Mon Feb 21 10:09:15 UTC 2022 - Dan Čermák - -- Correct from to point to the correct service pack - -------------------------------------------------------------------- -Tue Feb 15 09:59:37 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Tue Feb 8 16:03:40 UTC 2022 - Dan Čermák - -- Update labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Dec 1 14:49:12 UTC 2021 - Dan Čermák - -- Initial version of the BCI minimal container diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi deleted file mode 100644 index 5e0f67dad..000000000 --- a/minimal-image/minimal-image.kiwi +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI 15 SP4 Minimal Container Image - - - - - - - - - - - 15.4.0 - zypper - false - true - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nodejs-16-image/Dockerfile b/nodejs-16-image/Dockerfile deleted file mode 100644 index db7706c6f..000000000 --- a/nodejs-16-image/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2023 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 - - -#!BuildTag: bci/nodejs:16 -#!BuildTag: bci/nodejs:16-%RELEASE% -#!BuildTag: bci/node:16 -#!BuildTag: bci/node:16-%RELEASE% -#!BuildName: bci-nodejs-16 -#!BuildVersion: 15.10.4.16 -FROM suse/sle15:15.4 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.bci.nodejs -LABEL org.opencontainers.image.title="SLE BCI Node.js 16 development" -LABEL org.opencontainers.image.description="Node.js 16 development container based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="16" -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/nodejs:16-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="l3" -LABEL com.suse.supportlevel.until="2023-12-31" -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="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends nodejs16 npm16 git-core update-alternatives; zypper -n clean; rm -rf /var/log/* -ENV NODE_VERSION="16" - diff --git a/nodejs-16-image/_service b/nodejs-16-image/_service deleted file mode 100644 index 053a4f4f8..000000000 --- a/nodejs-16-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nodejs-16-image/nodejs-16-image.changes b/nodejs-16-image/nodejs-16-image.changes deleted file mode 100644 index 3814fc587..000000000 --- a/nodejs-16-image/nodejs-16-image.changes +++ /dev/null @@ -1,126 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Fri Sep 22 09:32:37 UTC 2023 - Dirk Mueller - -- add buildname when buildversion is set otherwise OBS ignores it - -------------------------------------------------------------------- -Wed Sep 13 10:56:02 UTC 2023 - Dirk Mueller - -- increase buildversion to allow downgrade to SP4 - The number 10 was chosen after careful consideration of - how many SPs will be released on SLE15 until end of 2023. - -------------------------------------------------------------------- -Mon Jul 24 12:55:01 UTC 2023 - Dirk Mueller - -- standardize description labels - -------------------------------------------------------------------- -Wed Jul 12 12:58:24 UTC 2023 - Dirk Mueller - -- 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 - -- Fix reference label - -------------------------------------------------------------------- -Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Thu May 18 07:41:13 UTC 2023 - Dirk Müller - -- extend end-date label to SP4 end of general support date - -------------------------------------------------------------------- -Thu May 4 13:20:07 UTC 2023 - Dirk Mueller - -- Add L3 support end-date label - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Wed Feb 15 15:01:15 UTC 2023 - Dan Čermák - -- Switch latest tag to nodejs 18 - -------------------------------------------------------------------- -Tue Dec 13 17:00:28 UTC 2022 - Dan Čermák - -- Add version to BuildVersion - -------------------------------------------------------------------- -Wed Oct 19 13:05:20 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:53:09 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 9 09:58:04 UTC 2022 - Dan Čermák - -- Set BuildVersion to 15.4 - -------------------------------------------------------------------- -Fri Jun 17 13:01:05 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Fri Jun 17 09:00:17 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:25:05 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:15:11 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:13:51 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:59:21 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Tue Mar 8 07:34:18 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42), Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this - -------------------------------------------------------------------- -Fri Feb 25 14:51:06 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 12:39:32 UTC 2022 - Dan Čermák - -- initial version of the NodeJS 16 container image diff --git a/postgres-14-image/Dockerfile b/postgres-14-image/Dockerfile deleted file mode 100644 index 3effc8370..000000000 --- a/postgres-14-image/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2023 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 - - -#!BuildTag: suse/postgres:14 -#!BuildTag: suse/postgres:14-%RELEASE% -#!BuildTag: suse/postgres:%%pg_version%% -#!BuildTag: suse/postgres:%%pg_version%%-%RELEASE% -#!BuildName: suse-postgres-14 -#!BuildVersion: 15.4.14 -FROM suse/sle15:15.4 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.postgres -LABEL org.opencontainers.image.title="SLE PostgreSQL 14" -LABEL org.opencontainers.image.description="PostgreSQL 14 container based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="14" -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/suse/postgres:14-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="acc" -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="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server; zypper -n clean; rm -rf /var/log/* -ENV LANG="en_US.utf8" -ENV PG_MAJOR="14" -ENV PG_VERSION="%%pg_version%%" -ENV PGDATA="/var/lib/pgsql/data" - -ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] -CMD ["postgres"] -EXPOSE 5432 -COPY docker-entrypoint.sh /usr/local/bin/ -RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \ - sed -i -e 's/exec gosu postgres "/exec setpriv --reuid=postgres --regid=postgres --clear-groups -- "/g' /usr/local/bin/docker-entrypoint.sh; \ - mkdir /docker-entrypoint-initdb.d; \ - install -m 1775 -o postgres -g postgres -d /run/postgresql; \ - install -d -m 0700 -o postgres -g postgres $PGDATA; \ - sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql14/postgresql.conf.sample - -STOPSIGNAL SIGINT -HEALTHCHECK --interval=10s --start-period=10s --timeout=5s \ - CMD pg_isready -U ${POSTGRES_USER:-postgres} -h localhost -p 5432 - -VOLUME $PGDATA diff --git a/postgres-14-image/LICENSE b/postgres-14-image/LICENSE deleted file mode 100644 index f86b1322e..000000000 --- a/postgres-14-image/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2014, Docker PostgreSQL Authors (See AUTHORS) - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/postgres-14-image/_constraints b/postgres-14-image/_constraints deleted file mode 100644 index 6213041ce..000000000 --- a/postgres-14-image/_constraints +++ /dev/null @@ -1,7 +0,0 @@ - - - - 8 - - - diff --git a/postgres-14-image/_service b/postgres-14-image/_service deleted file mode 100644 index 9f09fe948..000000000 --- a/postgres-14-image/_service +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Dockerfile - %%pg_version%% - postgresql14-server - minor - - \ No newline at end of file diff --git a/postgres-14-image/docker-entrypoint.sh b/postgres-14-image/docker-entrypoint.sh deleted file mode 100644 index 0ae0ecf8c..000000000 --- a/postgres-14-image/docker-entrypoint.sh +++ /dev/null @@ -1,351 +0,0 @@ -#!/usr/bin/env bash -set -Eeo pipefail -# TODO swap to -Eeuo pipefail above (after handling all potentially-unset variables) - -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - printf >&2 'error: both %s and %s are set (but are exclusive)\n' "$var" "$fileVar" - exit 1 - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -# check to see if this file is being run or sourced from another script -_is_sourced() { - # https://unix.stackexchange.com/a/215279 - [ "${#FUNCNAME[@]}" -ge 2 ] \ - && [ "${FUNCNAME[0]}" = '_is_sourced' ] \ - && [ "${FUNCNAME[1]}" = 'source' ] -} - -# used to create initial postgres directories and if run as root, ensure ownership to the "postgres" user -docker_create_db_directories() { - local user; user="$(id -u)" - - mkdir -p "$PGDATA" - # ignore failure since there are cases where we can't chmod (and PostgreSQL might fail later anyhow - it's picky about permissions of this directory) - chmod 00700 "$PGDATA" || : - - # ignore failure since it will be fine when using the image provided directory; see also https://github.com/docker-library/postgres/pull/289 - mkdir -p /var/run/postgresql || : - chmod 03775 /var/run/postgresql || : - - # Create the transaction log directory before initdb is run so the directory is owned by the correct user - if [ -n "${POSTGRES_INITDB_WALDIR:-}" ]; then - mkdir -p "$POSTGRES_INITDB_WALDIR" - if [ "$user" = '0' ]; then - find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' + - fi - chmod 700 "$POSTGRES_INITDB_WALDIR" - fi - - # allow the container to be started with `--user` - if [ "$user" = '0' ]; then - find "$PGDATA" \! -user postgres -exec chown postgres '{}' + - find /var/run/postgresql \! -user postgres -exec chown postgres '{}' + - fi -} - -# initialize empty PGDATA directory with new database via 'initdb' -# arguments to `initdb` can be passed via POSTGRES_INITDB_ARGS or as arguments to this function -# `initdb` automatically creates the "postgres", "template0", and "template1" dbnames -# this is also where the database user is created, specified by `POSTGRES_USER` env -docker_init_database_dir() { - # "initdb" is particular about the current user existing in "/etc/passwd", so we use "nss_wrapper" to fake that if necessary - # see https://github.com/docker-library/postgres/pull/253, https://github.com/docker-library/postgres/issues/359, https://cwrap.org/nss_wrapper.html - local uid; uid="$(id -u)" - if ! getent passwd "$uid" &> /dev/null; then - # see if we can find a suitable "libnss_wrapper.so" (https://salsa.debian.org/sssd-team/nss-wrapper/-/commit/b9925a653a54e24d09d9b498a2d913729f7abb15) - local wrapper - for wrapper in {/usr,}/lib{/*,}/libnss_wrapper.so; do - if [ -s "$wrapper" ]; then - NSS_WRAPPER_PASSWD="$(mktemp)" - NSS_WRAPPER_GROUP="$(mktemp)" - export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP - local gid; gid="$(id -g)" - printf 'postgres:x:%s:%s:PostgreSQL:%s:/bin/false\n' "$uid" "$gid" "$PGDATA" > "$NSS_WRAPPER_PASSWD" - printf 'postgres:x:%s:\n' "$gid" > "$NSS_WRAPPER_GROUP" - break - fi - done - fi - - if [ -n "${POSTGRES_INITDB_WALDIR:-}" ]; then - set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@" - fi - - # --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025 - eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"' - - # unset/cleanup "nss_wrapper" bits - if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then - rm -f "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP" - unset LD_PRELOAD NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP - fi -} - -# print large warning if POSTGRES_PASSWORD is long -# error if both POSTGRES_PASSWORD is empty and POSTGRES_HOST_AUTH_METHOD is not 'trust' -# print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust' -# assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ] -docker_verify_minimum_env() { - # check password first so we can output the warning before postgres - # messes it up - if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then - cat >&2 <<-'EOWARN' - - WARNING: The supplied POSTGRES_PASSWORD is 100+ characters. - - This will not work if used via PGPASSWORD with "psql". - - https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412) - https://github.com/docker-library/postgres/issues/507 - - EOWARN - fi - if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then - # The - option suppresses leading tabs but *not* spaces. :) - cat >&2 <<-'EOE' - Error: Database is uninitialized and superuser password is not specified. - You must specify POSTGRES_PASSWORD to a non-empty value for the - superuser. For example, "-e POSTGRES_PASSWORD=password" on "docker run". - - You may also use "POSTGRES_HOST_AUTH_METHOD=trust" to allow all - connections without a password. This is *not* recommended. - - See PostgreSQL documentation about "trust": - https://www.postgresql.org/docs/current/auth-trust.html - EOE - exit 1 - fi - if [ 'trust' = "$POSTGRES_HOST_AUTH_METHOD" ]; then - cat >&2 <<-'EOWARN' - ******************************************************************************** - WARNING: POSTGRES_HOST_AUTH_METHOD has been set to "trust". This will allow - anyone with access to the Postgres port to access your database without - a password, even if POSTGRES_PASSWORD is set. See PostgreSQL - documentation about "trust": - https://www.postgresql.org/docs/current/auth-trust.html - In Docker's default configuration, this is effectively any other - container on the same system. - - It is not recommended to use POSTGRES_HOST_AUTH_METHOD=trust. Replace - it with "-e POSTGRES_PASSWORD=password" instead to set a password in - "docker run". - ******************************************************************************** - EOWARN - fi -} - -# usage: docker_process_init_files [file [file [...]]] -# ie: docker_process_init_files /always-initdb.d/* -# process initializer files, based on file extensions and permissions -docker_process_init_files() { - # psql here for backwards compatibility "${psql[@]}" - psql=( docker_process_sql ) - - printf '\n' - local f - for f; do - case "$f" in - *.sh) - # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936 - # https://github.com/docker-library/postgres/pull/452 - if [ -x "$f" ]; then - printf '%s: running %s\n' "$0" "$f" - "$f" - else - printf '%s: sourcing %s\n' "$0" "$f" - . "$f" - fi - ;; - *.sql) printf '%s: running %s\n' "$0" "$f"; docker_process_sql -f "$f"; printf '\n' ;; - *.sql.gz) printf '%s: running %s\n' "$0" "$f"; gunzip -c "$f" | docker_process_sql; printf '\n' ;; - *.sql.xz) printf '%s: running %s\n' "$0" "$f"; xzcat "$f" | docker_process_sql; printf '\n' ;; - *.sql.zst) printf '%s: running %s\n' "$0" "$f"; zstd -dc "$f" | docker_process_sql; printf '\n' ;; - *) printf '%s: ignoring %s\n' "$0" "$f" ;; - esac - printf '\n' - done -} - -# Execute sql script, passed via stdin (or -f flag of pqsl) -# usage: docker_process_sql [psql-cli-args] -# ie: docker_process_sql --dbname=mydb <<<'INSERT ...' -# ie: docker_process_sql -f my-file.sql -# ie: docker_process_sql > "$PGDATA/pg_hba.conf" -} - -# start socket-only postgresql server for setting up or running scripts -# all arguments will be passed along as arguments to `postgres` (via pg_ctl) -docker_temp_server_start() { - if [ "$1" = 'postgres' ]; then - shift - fi - - # internal start of server in order to allow setup using psql client - # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" - - PGUSER="${PGUSER:-$POSTGRES_USER}" \ - pg_ctl -D "$PGDATA" \ - -o "$(printf '%q ' "$@")" \ - -w start -} - -# stop postgresql server after done setting up user and running scripts -docker_temp_server_stop() { - PGUSER="${PGUSER:-postgres}" \ - pg_ctl -D "$PGDATA" -m fast -w stop -} - -# check arguments for an option that would cause postgres to stop -# return true if there is one -_pg_want_help() { - local arg - for arg; do - case "$arg" in - # postgres --help | grep 'then exit' - # leaving out -C on purpose since it always fails and is unhelpful: - # postgres: could not access the server configuration file "/var/lib/postgresql/data/postgresql.conf": No such file or directory - -'?'|--help|--describe-config|-V|--version) - return 0 - ;; - esac - done - return 1 -} - -_main() { - # if first arg looks like a flag, assume we want to run postgres server - if [ "${1:0:1}" = '-' ]; then - set -- postgres "$@" - fi - - if [ "$1" = 'postgres' ] && ! _pg_want_help "$@"; then - docker_setup_env - # setup data directories and permissions (when run as root) - docker_create_db_directories - if [ "$(id -u)" = '0' ]; then - # then restart script as postgres user - exec gosu postgres "$BASH_SOURCE" "$@" - fi - - # only run initialization on an empty data directory - if [ -z "$DATABASE_ALREADY_EXISTS" ]; then - docker_verify_minimum_env - - # check dir permissions to reduce likelihood of half-initialized database - ls /docker-entrypoint-initdb.d/ > /dev/null - - docker_init_database_dir - pg_setup_hba_conf "$@" - - # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless - # e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS - export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}" - docker_temp_server_start "$@" - - docker_setup_db - docker_process_init_files /docker-entrypoint-initdb.d/* - - docker_temp_server_stop - unset PGPASSWORD - - cat <<-'EOM' - - PostgreSQL init process complete; ready for start up. - - EOM - else - cat <<-'EOM' - - PostgreSQL Database directory appears to contain a database; Skipping initialization - - EOM - fi - fi - - exec "$@" -} - -if ! _is_sourced; then - _main "$@" -fi diff --git a/postgres-14-image/postgres-14-image.changes b/postgres-14-image/postgres-14-image.changes deleted file mode 100644 index 8e2041ad3..000000000 --- a/postgres-14-image/postgres-14-image.changes +++ /dev/null @@ -1,187 +0,0 @@ -------------------------------------------------------------------- -Wed Oct 25 15:41:47 UTC 2023 - Dirk Mueller - -- ensure rundir for postgres is created with the proper permissions - -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Fri Sep 22 09:32:37 UTC 2023 - Dirk Mueller - -- add buildname when buildversion is set otherwise OBS ignores it - -------------------------------------------------------------------- -Tue Sep 19 15:45:11 UTC 2023 - Dirk Mueller - -- undo last change on buildversion - not needed for postgresql - -------------------------------------------------------------------- -Wed Sep 13 10:56:02 UTC 2023 - Dirk Mueller - -- increase buildversion to allow downgrade to SP4 - The number 10 was chosen after careful consideration of - how many SPs will be released on SLE15 until end of 2023. - -------------------------------------------------------------------- -Mon Jul 24 12:55:01 UTC 2023 - Dirk Mueller - -- standardize description labels - -------------------------------------------------------------------- -Wed Jul 12 12:58:24 UTC 2023 - Dirk Mueller - -- 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 - -- Fix reference label - -------------------------------------------------------------------- -Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Wed Apr 26 15:16:31 UTC 2023 - Dan Čermák - -- Switch supportlevel to acc - -------------------------------------------------------------------- -Thu Mar 30 15:12:57 UTC 2023 - Dirk Mueller - -- Fix signal handling and use ~postgres/data as the default PGDATA location - -------------------------------------------------------------------- -Wed Mar 29 13:35:34 UTC 2023 - Dan Čermák - -- Correct file permissions for chmod calls in docker-entrypoint.sh - -------------------------------------------------------------------- -Mon Mar 13 16:06:11 UTC 2023 - Dan Čermák - -- Switch latest tag to postgres 15 - -------------------------------------------------------------------- -Mon Mar 13 11:25:48 UTC 2023 - Dan Čermák - -- Add Healthcheck - -------------------------------------------------------------------- -Thu Mar 9 16:28:14 UTC 2023 - Dan Čermák - -- Specify the full path to the entrypoint, fixes bsc#1208521 - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Fri Dec 23 08:03:11 UTC 2022 - Dirk Müller - -- Update entrypoint scripts from upstream - -------------------------------------------------------------------- -Wed Dec 21 14:19:37 UTC 2022 - Dirk Müller - -- BuildTag sorting and consistency fixes - -------------------------------------------------------------------- -Tue Dec 13 17:00:28 UTC 2022 - Dan Čermák - -- Add version to BuildVersion - -------------------------------------------------------------------- -Wed Nov 30 14:37:52 UTC 2022 - Dan Čermák - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Wed Nov 23 07:58:21 UTC 2022 - Dan Čermák - -- Add _constraints to prevent FTBFS with small worker root partitions - -------------------------------------------------------------------- -Mon Sep 26 14:53:53 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Mon Sep 26 07:52:28 UTC 2022 - Dan Čermák - -- Add option to load zst databases, improve shell var expansion - -------------------------------------------------------------------- -Tue Aug 9 09:59:07 UTC 2022 - Dan Čermák - -- Set BuildVersion to 15.4 - -------------------------------------------------------------------- -Fri Jun 17 13:02:20 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Tue May 3 09:25:58 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:16:26 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:14:50 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 09:00:22 UTC 2022 - Dan Čermák - -- Add set -euo pipefail where applicable && Add the current git HEAD hash as the org.opencontainers.image.revision OCI label - -------------------------------------------------------------------- -Wed Mar 16 13:10:10 UTC 2022 - Dan Čermák - -- Fix quotes in CMD and ENTRYPOINT - -------------------------------------------------------------------- -Tue Mar 8 07:35:22 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42), Switch from PREFIXEDLABEL to LABEL now that the label helper can handle this - -------------------------------------------------------------------- -Fri Feb 25 14:51:58 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 12:33:30 UTC 2022 - Dan Čermák - -- Correct labelprefix - -------------------------------------------------------------------- -Tue Feb 15 09:59:02 UTC 2022 - Dan Čermák - -- Add latest tag -- Add SPDX license identifier - -------------------------------------------------------------------- -Tue Feb 8 16:03:07 UTC 2022 - Dan Čermák - -- Update labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Jan 5 11:22:40 UTC 2022 - Dan Čermák - -- First version of the postgres 14 container diff --git a/python-3.10-image/Dockerfile b/python-3.10-image/Dockerfile deleted file mode 100644 index 4553513fa..000000000 --- a/python-3.10-image/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2023 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 - - -#!BuildTag: bci/python:3.10 -#!BuildTag: bci/python:3.10-%RELEASE% -#!BuildTag: bci/python:3 -#!BuildTag: bci/python:3-%RELEASE% -#!BuildName: bci-python-3.10 -#!BuildVersion: 15.4.3.10 -FROM suse/sle15:15.4 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.bci.python -LABEL org.opencontainers.image.title="SLE BCI Python 3.10 development" -LABEL org.opencontainers.image.description="Python 3.10 development container based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="3.10" -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/python:3.10-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="l3" -LABEL com.suse.supportlevel.until="2023-12-31" -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="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends python310-devel python310 python310-pip curl git-core lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/* -ENV PYTHON_VERSION="%%py310_ver%%" -ENV PATH="$PATH:/root/.local/bin" -ENV PIP_VERSION="%%pip_ver%%" - -RUN set -euo pipefail; install -d -m 0755 /root/.local/bin; ln -s /usr/bin/python3.10 /usr/local/bin/python3; \ - ln -s /usr/bin/pydoc3.10 /usr/local/bin/pydoc diff --git a/python-3.10-image/_service b/python-3.10-image/_service deleted file mode 100644 index ece03cca8..000000000 --- a/python-3.10-image/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Dockerfile - %%py310_ver%% - python310-base - - - Dockerfile - %%pip_ver%% - python310-pip - - \ No newline at end of file diff --git a/python-3.10-image/python-3.10-image.changes b/python-3.10-image/python-3.10-image.changes deleted file mode 100644 index eeb59da79..000000000 --- a/python-3.10-image/python-3.10-image.changes +++ /dev/null @@ -1,119 +0,0 @@ -------------------------------------------------------------------- -Wed Oct 4 07:34:21 UTC 2023 - Dirk Mueller - -- include lifecycle data - -------------------------------------------------------------------- -Thu Sep 28 14:29:26 UTC 2023 - Dirk Mueller - -- add copyright and description header - -------------------------------------------------------------------- -Thu Sep 28 12:32:55 UTC 2023 - Dirk Mueller - -- correct descriptions to be more consistent - -------------------------------------------------------------------- -Thu Sep 28 10:32:37 UTC 2023 - Dirk Mueller - -- include lifecycle data in the container as well - -------------------------------------------------------------------- -Mon Sep 25 10:57:06 UTC 2023 - Dirk Müller - -- Add /root/.local/bin to PATH, jsc#PED-5573 - -------------------------------------------------------------------- -Fri Sep 22 09:32:37 UTC 2023 - Dirk Mueller - -- add buildname when buildversion is set otherwise OBS ignores it - -------------------------------------------------------------------- -Mon Jun 26 20:57:19 UTC 2023 - Dirk Mueller - -- label capitalization and other cleanups - -------------------------------------------------------------------- -Tue May 30 06:52:15 UTC 2023 - Dan Čermák - -- Fix lifecycle url - -------------------------------------------------------------------- -Tue May 16 12:04:50 UTC 2023 - Dirk Müller - -- remove latest tag, will be moved to Python 3.11 - -------------------------------------------------------------------- -Fri Mar 3 07:25:39 UTC 2023 - Dan Čermák - -- Add org.opencontainers.image.source label set to %SOURCEURL% - -------------------------------------------------------------------- -Wed Dec 21 14:19:37 UTC 2022 - Dirk Müller - -- BuildTag sorting and consistency fixes - -------------------------------------------------------------------- -Tue Dec 13 17:00:28 UTC 2022 - Dan Čermák - -- Add version to BuildVersion - -------------------------------------------------------------------- -Tue Nov 29 12:34:13 UTC 2022 - Dan Čermák - -- Add main python package to include bundled modules (fixes bsc#1205850) - -------------------------------------------------------------------- -Tue Nov 22 11:34:05 UTC 2022 - Dirk Mueller - -- Add the devel package into the container to prevent dependency issues on maintenance updates - -------------------------------------------------------------------- -Wed Oct 19 13:42:57 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:51:55 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 9 09:56:49 UTC 2022 - Dan Čermák - -- Set BuildVersion to 15.4 - -------------------------------------------------------------------- -Fri Jun 17 12:58:57 UTC 2022 - Dan Čermák - -- Set the release-stage label to released - -------------------------------------------------------------------- -Fri Jun 17 08:58:53 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:23:16 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:12:55 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:11:52 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Wed Apr 20 09:04:56 UTC 2022 - Dan Čermák - -- Do not remove python 3.6 packages that are not installed; don't symlink pip & pip3; symlink into /usr/local/bin - -------------------------------------------------------------------- -Wed Apr 13 09:19:50 UTC 2022 - Dan Čermák - -- First version of the Python 3.10 Container diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile deleted file mode 100644 index 55073f125..000000000 --- a/sle15-kernel-module-devel-image/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2023 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 - - -#!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP% -#!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%.%RELEASE% -#!BuildName: bci-bci-sle15-kernel-module-devel-%OS_VERSION_ID_SP% -#!BuildVersion: 15.4 -FROM suse/sle15:15.4 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.bci.sle15-kernel-module-devel -LABEL org.opencontainers.image.title="SLE BCI SLE 15 Kernel Module Development" -LABEL org.opencontainers.image.description="SLE 15 Kernel Module Development container based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%" -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/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%.%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="techpreview" -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="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends kernel-devel kernel-syms gcc kmod-compat make patch awk tar; zypper -n clean; rm -rf /var/log/* diff --git a/sle15-kernel-module-devel-image/_constraints b/sle15-kernel-module-devel-image/_constraints deleted file mode 100644 index 6213041ce..000000000 --- a/sle15-kernel-module-devel-image/_constraints +++ /dev/null @@ -1,7 +0,0 @@ - - - - 8 - - - diff --git a/sle15-kernel-module-devel-image/_service b/sle15-kernel-module-devel-image/_service deleted file mode 100644 index 053a4f4f8..000000000 --- a/sle15-kernel-module-devel-image/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes b/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes deleted file mode 100644 index c8b622c31..000000000 --- a/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Thu Oct 12 13:58:03 UTC 2023 - SUSE Update Bot - -- First version of the SLE 15 Kernel Module Development BCI