From 531dcaca1ede5c289ba3372655596ba84b67e89f 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 --- .github/dependabot.yml | 7 + .github/workflows/changelog_checker.yml | 2 +- .github/workflows/find-missing-packages.yml | 57 +++ .obs/workflows.yml | 122 +----- base-fips-image/Dockerfile | 61 +++ base-fips-image/README.md | 3 + {init => base-fips-image}/_service | 2 +- base-fips-image/base-fips-image.changes | 4 + golang-1.18/_constraints | 7 - golang-1.18/_service | 9 - golang-1.18/config.sh | 30 -- golang-1.18/golang-1.18.changes | 60 --- golang-1.18/golang-1.18.kiwi | 61 --- init/config.sh | 30 -- init/init.changes | 106 ----- init/init.kiwi | 55 --- micro/_service | 4 - micro/config.sh | 31 -- micro/micro.changes | 108 ----- micro/micro.kiwi | 56 --- minimal/_service | 4 - minimal/config.sh | 30 -- minimal/minimal.changes | 120 ------ minimal/minimal.kiwi | 61 --- nodejs-12/_service | 4 - nodejs-12/config.sh | 30 -- nodejs-12/nodejs-12.changes | 76 ---- nodejs-12/nodejs-12.kiwi | 60 --- nodejs-14/_service | 4 - nodejs-14/config.sh | 30 -- nodejs-14/nodejs-14.changes | 101 ----- nodejs-14/nodejs-14.kiwi | 60 --- nodejs-16/_service | 4 - nodejs-16/config.sh | 30 -- nodejs-16/nodejs-16.changes | 54 --- nodejs-16/nodejs-16.kiwi | 60 --- openjdk-11-devel/_constraints | 7 - openjdk-11-devel/_service | 4 - openjdk-11-devel/config.sh | 30 -- openjdk-11-devel/openjdk-11-devel.changes | 95 ----- openjdk-11-devel/openjdk-11-devel.kiwi | 62 --- openjdk-11/_constraints | 7 - openjdk-11/_service | 4 - openjdk-11/config.sh | 30 -- openjdk-11/openjdk-11.changes | 85 ---- openjdk-11/openjdk-11.kiwi | 59 --- pcp-image/10-host_mount.conf.template | 6 - pcp-image/Dockerfile | 45 -- pcp-image/README.md | 93 ---- pcp-image/_service | 22 - pcp-image/container-entrypoint | 39 -- pcp-image/healthcheck | 16 - pcp-image/pcp-image.changes | 54 --- pcp-image/pmcd | 37 -- pcp-image/pmlogger | 27 -- pcp-image/pmproxy.conf.template | 87 ---- python-3.6/_service | 14 - python-3.6/config.sh | 30 -- python-3.6/python-3.6.changes | 90 ---- python-3.6/python-3.6.kiwi | 62 --- python-3.9/_service | 14 - python-3.9/config.sh | 34 -- python-3.9/python-3.9.changes | 115 ----- python-3.9/python-3.9.kiwi | 61 --- rmt-mariadb-client/Dockerfile | 27 -- rmt-mariadb-client/_service | 10 - rmt-mariadb-client/rmt-mariadb-client.changes | 56 --- rmt-mariadb/Dockerfile | 46 -- rmt-mariadb/_service | 10 - rmt-mariadb/docker-entrypoint.sh | 400 ------------------ rmt-mariadb/rmt-mariadb.changes | 55 --- rmt-nginx/10-listen-on-ipv6-by-default.sh | 67 --- rmt-nginx/20-envsubst-on-templates.sh | 39 -- rmt-nginx/30-tune-worker-processes.sh | 188 -------- rmt-nginx/Dockerfile | 47 -- rmt-nginx/LICENSE | 23 - rmt-nginx/_service | 10 - rmt-nginx/docker-entrypoint.sh | 47 -- rmt-nginx/index.html | 18 - rmt-nginx/rmt-nginx.changes | 64 --- rmt-server/Dockerfile | 33 -- rmt-server/_service | 10 - rmt-server/entrypoint.sh | 55 --- rmt-server/rmt-server.changes | 73 ---- ruby-2.5-image/_service | 15 - ruby-2.5-image/config.sh | 30 -- ruby-2.5-image/ruby-2.5-image.changes | 93 ---- ruby-2.5-image/ruby-2.5-image.kiwi | 69 --- 88 files changed, 149 insertions(+), 4108 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/find-missing-packages.yml create mode 100644 base-fips-image/Dockerfile create mode 100644 base-fips-image/README.md rename {init => base-fips-image}/_service (58%) create mode 100644 base-fips-image/base-fips-image.changes delete mode 100644 golang-1.18/_constraints delete mode 100644 golang-1.18/_service delete mode 100644 golang-1.18/config.sh delete mode 100644 golang-1.18/golang-1.18.changes delete mode 100644 golang-1.18/golang-1.18.kiwi delete mode 100644 init/config.sh delete mode 100644 init/init.changes delete mode 100644 init/init.kiwi delete mode 100644 micro/_service delete mode 100644 micro/config.sh delete mode 100644 micro/micro.changes delete mode 100644 micro/micro.kiwi delete mode 100644 minimal/_service delete mode 100644 minimal/config.sh delete mode 100644 minimal/minimal.changes delete mode 100644 minimal/minimal.kiwi delete mode 100644 nodejs-12/_service delete mode 100644 nodejs-12/config.sh delete mode 100644 nodejs-12/nodejs-12.changes delete mode 100644 nodejs-12/nodejs-12.kiwi delete mode 100644 nodejs-14/_service delete mode 100644 nodejs-14/config.sh delete mode 100644 nodejs-14/nodejs-14.changes delete mode 100644 nodejs-14/nodejs-14.kiwi delete mode 100644 nodejs-16/_service delete mode 100644 nodejs-16/config.sh delete mode 100644 nodejs-16/nodejs-16.changes delete mode 100644 nodejs-16/nodejs-16.kiwi delete mode 100644 openjdk-11-devel/_constraints delete mode 100644 openjdk-11-devel/_service delete mode 100644 openjdk-11-devel/config.sh delete mode 100644 openjdk-11-devel/openjdk-11-devel.changes delete mode 100644 openjdk-11-devel/openjdk-11-devel.kiwi delete mode 100644 openjdk-11/_constraints delete mode 100644 openjdk-11/_service delete mode 100644 openjdk-11/config.sh delete mode 100644 openjdk-11/openjdk-11.changes delete mode 100644 openjdk-11/openjdk-11.kiwi delete mode 100644 pcp-image/10-host_mount.conf.template delete mode 100644 pcp-image/Dockerfile delete mode 100644 pcp-image/README.md delete mode 100644 pcp-image/_service delete mode 100644 pcp-image/container-entrypoint delete mode 100644 pcp-image/healthcheck delete mode 100644 pcp-image/pcp-image.changes delete mode 100644 pcp-image/pmcd delete mode 100644 pcp-image/pmlogger delete mode 100644 pcp-image/pmproxy.conf.template delete mode 100644 python-3.6/_service delete mode 100644 python-3.6/config.sh delete mode 100644 python-3.6/python-3.6.changes delete mode 100644 python-3.6/python-3.6.kiwi delete mode 100644 python-3.9/_service delete mode 100644 python-3.9/config.sh delete mode 100644 python-3.9/python-3.9.changes delete mode 100644 python-3.9/python-3.9.kiwi delete mode 100644 rmt-mariadb-client/Dockerfile delete mode 100644 rmt-mariadb-client/_service delete mode 100644 rmt-mariadb-client/rmt-mariadb-client.changes delete mode 100644 rmt-mariadb/Dockerfile delete mode 100644 rmt-mariadb/_service delete mode 100644 rmt-mariadb/docker-entrypoint.sh delete mode 100644 rmt-mariadb/rmt-mariadb.changes delete mode 100644 rmt-nginx/10-listen-on-ipv6-by-default.sh delete mode 100644 rmt-nginx/20-envsubst-on-templates.sh delete mode 100644 rmt-nginx/30-tune-worker-processes.sh delete mode 100644 rmt-nginx/Dockerfile delete mode 100644 rmt-nginx/LICENSE delete mode 100644 rmt-nginx/_service delete mode 100644 rmt-nginx/docker-entrypoint.sh delete mode 100644 rmt-nginx/index.html delete mode 100644 rmt-nginx/rmt-nginx.changes delete mode 100644 rmt-server/Dockerfile delete mode 100644 rmt-server/_service delete mode 100644 rmt-server/entrypoint.sh delete mode 100644 rmt-server/rmt-server.changes delete mode 100644 ruby-2.5-image/_service delete mode 100644 ruby-2.5-image/config.sh delete mode 100644 ruby-2.5-image/ruby-2.5-image.changes delete mode 100644 ruby-2.5-image/ruby-2.5-image.kiwi diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..900df3257 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +--- +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/changelog_checker.yml b/.github/workflows/changelog_checker.yml index 5dd60730b..5ff945fc4 100644 --- a/.github/workflows/changelog_checker.yml +++ b/.github/workflows/changelog_checker.yml @@ -32,7 +32,7 @@ jobs: - name: check the changelog run: | - poetry run ./scratch-build-bot.py \ + poetry run scratch-build-bot \ --os-version 3 -vvvv \ changelog_check \ --base-ref origin/${{ github.base_ref }} \ diff --git a/.github/workflows/find-missing-packages.yml b/.github/workflows/find-missing-packages.yml new file mode 100644 index 000000000..01d117e3d --- /dev/null +++ b/.github/workflows/find-missing-packages.yml @@ -0,0 +1,57 @@ +--- +name: Check whether packages are missing on OBS + +on: + push: + branches: + - 'sle15-sp3' + +jobs: + create-issues-for-dan: + name: create an issue for Dan to create the packages in devel:BCI + runs-on: ubuntu-latest + container: ghcr.io/dcermak/bci-ci:latest + + strategy: + fail-fast: false + + steps: + # we need all branches for the build checks + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + ref: main + token: ${{ secrets.CHECKOUT_TOKEN }} + + - uses: actions/cache@v3 + with: + path: ~/.cache/pypoetry/virtualenvs + key: poetry-${{ hashFiles('poetry.lock') }} + + - name: fix the file permissions of the repository + run: chown -R $(id -un):$(id -gn) . + + - name: install python dependencies + run: poetry install + + - name: find the packages that are missing + run: | + pkgs=$(poetry run scratch-build-bot --os-version 3 find_missing_packages) + if [[ ${pkgs} = "" ]]; then + echo "missing_pkgs=false" >> $GITHUB_ENV + else + echo "missing_pkgs=true" >> $GITHUB_ENV + echo "pkgs=${pkgs}" >> $GITHUB_ENV + fi + cat test-build.env >> $GITHUB_ENV + env: + OSC_PASSWORD: ${{ secrets.OSC_PASSWORD }} + OSC_USER: "defolos" + + - uses: JasonEtco/create-an-issue@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + update_existing: true + filename: ".github/create-package.md" + if: env.missing_pkgs == 'true' diff --git a/.obs/workflows.yml b/.obs/workflows.yml index 9705cbb34..719bd101f 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -3,122 +3,30 @@ staging_build: steps: - branch_package: source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: python-3.6 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: python-3.9 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: rmt-nginx - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: pcp-image - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: rmt-server - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: golang-1.18 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: ruby-2.5-image - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: nodejs-14 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: nodejs-16 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: openjdk-11-devel - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: openjdk-11 - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: init - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: rmt-mariadb - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: rmt-mariadb-client - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: minimal - target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP3 - source_package: micro + source_package: base-fips-image target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging filters: event: pull_request -refresh_devel_BCI: +refresh_staging_project: steps: - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: python-3.6 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: python-3.9 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: rmt-nginx - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: pcp-image - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: rmt-server - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: golang-1.18 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: ruby-2.5-image - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: nodejs-14 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: nodejs-16 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: openjdk-11-devel - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: openjdk-11 - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: init - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: rmt-mariadb - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: rmt-mariadb-client - - trigger_services: - project: devel:BCI:SLE-15-SP3 - package: minimal + project: home:defolos:BCI:CR:SLE-15-SP3 + package: _project + filters: + event: push + branches: + only: + - sle15-sp3 + + +refresh_devel_BCI: + steps: - trigger_services: project: devel:BCI:SLE-15-SP3 - package: micro + package: base-fips-image filters: + event: push branches: only: - sle15-sp3 diff --git a/base-fips-image/Dockerfile b/base-fips-image/Dockerfile new file mode 100644 index 000000000..3b31a4664 --- /dev/null +++ b/base-fips-image/Dockerfile @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: MIT + +# Copyright (c) 2024 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 + +#!ExclusiveArch: x86_64 +#!BuildTag: suse/ltss/sle15.3/bci-base-fips:%OS_VERSION_ID_SP% +#!BuildTag: suse/ltss/sle15.3/bci-base-fips:%OS_VERSION_ID_SP%.%RELEASE% +#!BuildName: suse-ltss-sle15.3-bci-base-fips-%OS_VERSION_ID_SP% +#!BuildVersion: 15.3 +FROM suse/ltss/sle15.3/sle15:15.3 + +MAINTAINER SUSE LLC (https://www.suse.com/) + +# Define labels according to https://en.opensuse.org/Building_derived_containers +# labelprefix=com.suse.sle.base-fips +LABEL org.opencontainers.image.title="SLE LTSS BCI 15 SP3 FIPS-140-2" +LABEL org.opencontainers.image.description="15 SP3 FIPS-140-2 container based on the SLE LTSS 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 io.artifacthub.package.readme-url="%SOURCEURL%/README.md" +LABEL org.opensuse.reference="registry.suse.com/suse/ltss/sle15.3/bci-base-fips:%OS_VERSION_ID_SP%.%RELEASE%" +LABEL org.openbuildservice.disturl="%DISTURL%" +LABEL com.suse.supportlevel="l3" +LABEL com.suse.eula="sle-eula" +LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15" +LABEL com.suse.release-stage="released" +# endlabelprefix +LABEL usage="This container should only be used on a FIPS enabled host (fips=1 on kernel cmdline)." + +RUN set -euo pipefail; zypper -n in --no-recommends fipscheck sles-ltss-release; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +#!RemoteAssetUrl: https://api.opensuse.org/public/build/SUSE:SLE-15-SP2:Update/pool/x86_64/openssl-1_1.18804/openssl-1_1-1.1.1d-11.20.1.x86_64.rpm +COPY openssl-1_1-1.1.1d-11.20.1.x86_64.rpm . +#!RemoteAssetUrl: https://api.opensuse.org/public/build/SUSE:SLE-15-SP2:Update/pool/x86_64/openssl-1_1.18804/libopenssl1_1-1.1.1d-11.20.1.x86_64.rpm +COPY libopenssl1_1-1.1.1d-11.20.1.x86_64.rpm . +#!RemoteAssetUrl: https://api.opensuse.org/public/build/SUSE:SLE-15-SP2:Update/pool/x86_64/openssl-1_1.18804/libopenssl1_1-hmac-1.1.1d-11.20.1.x86_64.rpm +COPY libopenssl1_1-hmac-1.1.1d-11.20.1.x86_64.rpm . +#!RemoteAssetUrl: https://api.opensuse.org/public/build/SUSE:SLE-15-SP1:Update/pool/x86_64/libgcrypt.15117/libgcrypt20-1.8.2-8.36.1.x86_64.rpm +COPY libgcrypt20-1.8.2-8.36.1.x86_64.rpm . +#!RemoteAssetUrl: https://api.opensuse.org/public/build/SUSE:SLE-15-SP1:Update/pool/x86_64/libgcrypt.15117/libgcrypt20-hmac-1.8.2-8.36.1.x86_64.rpm +COPY libgcrypt20-hmac-1.8.2-8.36.1.x86_64.rpm . +RUN set -euo pipefail; \ + [ $(LC_ALL=C rpm --checksig -v *rpm | \ + grep -c -E "^ *V3.*key ID 39db7c82: OK") = 5 ] \ + && rpm -Uvh --oldpackage *.rpm \ + && rm -vf *.rpm \ + && rpmqpack | grep -E '(openssl|libgcrypt)' | xargs zypper -n addlock +ENV OPENSSL_FORCE_FIPS_MODE=1 diff --git a/base-fips-image/README.md b/base-fips-image/README.md new file mode 100644 index 000000000..76d424d3f --- /dev/null +++ b/base-fips-image/README.md @@ -0,0 +1,3 @@ +# The SLE LTSS BCI 15 SP3 FIPS-140-2 Container image + +15 SP3 FIPS-140-2 container based on the SLE LTSS Base Container Image. diff --git a/init/_service b/base-fips-image/_service similarity index 58% rename from init/_service rename to base-fips-image/_service index 19923f6d9..053a4f4f8 100644 --- a/init/_service +++ b/base-fips-image/_service @@ -1,4 +1,4 @@ + - \ No newline at end of file diff --git a/base-fips-image/base-fips-image.changes b/base-fips-image/base-fips-image.changes new file mode 100644 index 000000000..28c209643 --- /dev/null +++ b/base-fips-image/base-fips-image.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue May 07 12:40:20 UTC 2024 - SUSE Update Bot + +- First version of the 15 SP3 FIPS-140-2 BCI diff --git a/golang-1.18/_constraints b/golang-1.18/_constraints deleted file mode 100644 index 6213041ce..000000000 --- a/golang-1.18/_constraints +++ /dev/null @@ -1,7 +0,0 @@ - - - - 8 - - - diff --git a/golang-1.18/_service b/golang-1.18/_service deleted file mode 100644 index 34fd6bb64..000000000 --- a/golang-1.18/_service +++ /dev/null @@ -1,9 +0,0 @@ - - - - - golang-1.18.kiwi - %%golang_version%% - go1.18 - - \ No newline at end of file diff --git a/golang-1.18/config.sh b/golang-1.18/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/golang-1.18/config.sh +++ /dev/null @@ -1,30 +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/golang-1.18/golang-1.18.changes b/golang-1.18/golang-1.18.changes deleted file mode 100644 index b9a6473db..000000000 --- a/golang-1.18/golang-1.18.changes +++ /dev/null @@ -1,60 +0,0 @@ -------------------------------------------------------------------- -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 - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:16 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:19:06 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Wed May 4 07:41:34 UTC 2022 - Dan Čermák - -- Remove accidentally added Dockerfile - -------------------------------------------------------------------- -Thu Apr 28 11:42:27 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Thu Apr 28 10:00:04 UTC 2022 - Dan Čermák - -- Increase disk constraints to 8GB - -------------------------------------------------------------------- -Fri Apr 22 08:13:19 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label -- add git-core to the container image - -------------------------------------------------------------------- -Wed Apr 20 14:08:04 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 19 11:31:29 UTC 2022 - Dan Čermák - -- Add GOPATH environment variable and fix GOLANG_VERSION (fixes bsc#1198386) - -------------------------------------------------------------------- -Tue Apr 12 08:45:35 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 Apr 5 10:24:07 UTC 2022 - Dan Čermák - -- First version of the Go 1.18 image, jsc#BCI-94 diff --git a/golang-1.18/golang-1.18.kiwi b/golang-1.18/golang-1.18.kiwi deleted file mode 100644 index 585c1dd44..000000000 --- a/golang-1.18/golang-1.18.kiwi +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Golang 1.18 Container Image - - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - \ No newline at end of file diff --git a/init/config.sh b/init/config.sh deleted file mode 100644 index c4c90bd34..000000000 --- a/init/config.sh +++ /dev/null @@ -1,30 +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 - -systemctl disable getty@tty1.service - -#======================================= -# 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/init.changes b/init/init.changes deleted file mode 100644 index 310d09d56..000000000 --- a/init/init.changes +++ /dev/null @@ -1,106 +0,0 @@ -------------------------------------------------------------------- -Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 12:24:33 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:58 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 30 12:52:14 UTC 2022 - Dan Čermák - -- Disable getty@tty1.service, fixes bsc#1198102 - -------------------------------------------------------------------- -Tue Aug 16 10:12:17 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:52:22 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:21:04 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 09:19:59 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Thu Apr 28 11:43:16 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:14:22 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:08:56 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:29 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 14:19:19 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) -- Include statement about only supporting podman - -------------------------------------------------------------------- -Fri Feb 25 14:30:44 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:43:03 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:07:07 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:22:00 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 13:13:01 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Dec 7 11:33:18 UTC 2021 - Dan Čermák - -- Fix title & description labels -- Add gzip as an explicit dependency to allow building with ExpandFlags: kiwi-nobasepackages - -------------------------------------------------------------------- -Mon Sep 20 11:18:46 UTC 2021 - Dan Čermák - -- Fix container labels - -------------------------------------------------------------------- -Fri Sep 17 09:13:23 UTC 2021 - Dan Čermák - -- Initial version of the BCI init container diff --git a/init/init.kiwi b/init/init.kiwi deleted file mode 100644 index 5d5754f21..000000000 --- a/init/init.kiwi +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI %OS_VERSION_NO_DASH% Init Container Image - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - \ No newline at end of file diff --git a/micro/_service b/micro/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/micro/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/micro/config.sh b/micro/config.sh deleted file mode 100644 index cb89a0880..000000000 --- a/micro/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/micro.changes b/micro/micro.changes deleted file mode 100644 index dd6bb2d23..000000000 --- a/micro/micro.changes +++ /dev/null @@ -1,108 +0,0 @@ -------------------------------------------------------------------- -Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 12:26:13 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:53:22 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 16 10:12:49 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:52:15 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:20:58 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 09:20:30 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Wed May 25 13:21:19 UTC 2022 - Bruno Leon - -- Add BCI EULA to bci-micro - -------------------------------------------------------------------- -Tue May 3 09:29:07 UTC 2022 - Dan Čermák - -- Add coreutils package to prevent dependency resolution errors -- Run suseImportBuildKey only if rpm is present -- Remove nop suseSetupProduct -- cleanup after zypper if zypper is installed -- ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:15:03 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:09:30 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46: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:31:28 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:31:10 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:43:19 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:07:25 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:22:16 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 13:10:03 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Dec 7 11:37:14 UTC 2021 - Dan Čermák - -- Fix title & description labels - -------------------------------------------------------------------- -Mon Oct 18 12:11:08 UTC 2021 - Dan Čermák - -- Ensure ca-certificates-mozilla-prebuilt is installed - -------------------------------------------------------------------- -Mon Sep 20 09:34:03 UTC 2021 - Dan Čermák - -- Initial version of the BCI micro container diff --git a/micro/micro.kiwi b/micro/micro.kiwi deleted file mode 100644 index 9dc1eb54d..000000000 --- a/micro/micro.kiwi +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI %OS_VERSION_NO_DASH% Micro Container Image - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/minimal/_service b/minimal/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/minimal/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/minimal/config.sh b/minimal/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/minimal/config.sh +++ /dev/null @@ -1,30 +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/minimal/minimal.changes b/minimal/minimal.changes deleted file mode 100644 index 58ca1b82b..000000000 --- a/minimal/minimal.changes +++ /dev/null @@ -1,120 +0,0 @@ -------------------------------------------------------------------- -Mon Jan 2 13:42:31 UTC 2023 - Dan Čermák - -- Bump copyright year - -------------------------------------------------------------------- -Wed Oct 19 12:26:06 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:53:16 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Tue Aug 16 10:12:41 UTC 2022 - Dan Čermák - -- Use %OS_VERSION_NO_DASH% for proper branding - -------------------------------------------------------------------- -Thu Jul 7 14:52:08 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Tue Jul 5 10:20:50 UTC 2022 - Dan Čermák - -- Fix image name - -------------------------------------------------------------------- -Fri Jun 17 09:20:22 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:29:01 UTC 2022 - Dan Čermák - -- Run suseImportBuildKey only if rpm is present -- Remove nop suseSetupProduct -- cleanup after zypper if zypper is installed -- ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:14:53 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:09:22 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:52 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:31:13 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:31:02 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Mon Feb 21 10:08:13 UTC 2022 - Dan Čermák - -- Correct from to point to the correct service pack - -------------------------------------------------------------------- -Tue Feb 15 09:43:11 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:07:16 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:22:07 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 13:06:14 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Dec 7 11:36:46 UTC 2021 - Dan Čermák - -- Fix title & description labels -- Add perl-base to allow building with ExpandFlags: kiwi-nobasepackages - -------------------------------------------------------------------- -Wed Oct 20 12:27:50 UTC 2021 - Dan Čermák - -- Remove ca-certificates-mozilla-prebuilt from package list - (this is now inherited from the micro container) - -------------------------------------------------------------------- -Tue Oct 12 14:35:48 UTC 2021 - Frederic Crozat - -- Ensure ca-certificates-mozilla-prebuilt is used instead of - using our home-made bundle. - -------------------------------------------------------------------- -Mon Sep 20 10:13:28 UTC 2021 - Dan Čermák - -- Fix labels & cull config.sh - -------------------------------------------------------------------- -Mon Sep 20 09:32:39 UTC 2021 - Dan Čermák - -- Initial version of the BCI minimal container diff --git a/minimal/minimal.kiwi b/minimal/minimal.kiwi deleted file mode 100644 index 46f44f8f2..000000000 --- a/minimal/minimal.kiwi +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI %OS_VERSION_NO_DASH% Minimal Container Image - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nodejs-12/_service b/nodejs-12/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/nodejs-12/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nodejs-12/config.sh b/nodejs-12/config.sh deleted file mode 100644 index 2430ed3eb..000000000 --- a/nodejs-12/config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: (c) 2022 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/nodejs-12/nodejs-12.changes b/nodejs-12/nodejs-12.changes deleted file mode 100644 index 12edd53bd..000000000 --- a/nodejs-12/nodejs-12.changes +++ /dev/null @@ -1,76 +0,0 @@ -------------------------------------------------------------------- -Mon Sep 26 14:52:39 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Thu Apr 28 11:42:55 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:13:36 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:08:18 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:45:51 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:30:00 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:29:12 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:47:36 UTC 2022 - Dan Čermák - -- Add SPDX license identifier and remove NPM_VERSION env variable - -------------------------------------------------------------------- -Tue Feb 8 16:21:30 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 13:24:32 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Jan 5 12:56:22 UTC 2022 - Dan Čermák - -- Fix NPM version - -------------------------------------------------------------------- -Tue Dec 7 11:41:16 UTC 2021 - Dan Čermák - -- Fix title & description labels -- remove suse-build-key as a direct dependency, it will be pulled in indirectly anyway -- add update-alternatives package to allow building with ExpandFlags: kiwi-nobasepackages - -------------------------------------------------------------------- -Mon Sep 20 10:31:41 UTC 2021 - Dan Čermák - -- Fix container labels - -------------------------------------------------------------------- -Thu Sep 16 07:50:39 UTC 2021 - Dan Čermák - -- Fix environment variables - -------------------------------------------------------------------- -Tue Sep 14 13:21:48 UTC 2021 - Dan Čermák - -- First version of the NodeJS 12 container diff --git a/nodejs-12/nodejs-12.kiwi b/nodejs-12/nodejs-12.kiwi deleted file mode 100644 index 71c4fbf35..000000000 --- a/nodejs-12/nodejs-12.kiwi +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Node.js 12 Container Image - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/nodejs-14/_service b/nodejs-14/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/nodejs-14/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nodejs-14/config.sh b/nodejs-14/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/nodejs-14/config.sh +++ /dev/null @@ -1,30 +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/nodejs-14/nodejs-14.changes b/nodejs-14/nodejs-14.changes deleted file mode 100644 index 1dfb0c815..000000000 --- a/nodejs-14/nodejs-14.changes +++ /dev/null @@ -1,101 +0,0 @@ -------------------------------------------------------------------- -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 - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:28 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Thu Apr 28 11:42:41 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:13:44 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:08:26 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:45:58 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:30:12 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:29:21 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Mon Feb 21 14:31:56 UTC 2022 - Dan Čermák - -- Drop latest tag - -------------------------------------------------------------------- -Tue Feb 15 09:47:47 UTC 2022 - Dan Čermák - -- Add SPDX license identifier and remove NPM_VERSION env variable - -------------------------------------------------------------------- -Thu Feb 10 15:06:41 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:21:38 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 13:29:44 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Jan 5 12:57:24 UTC 2022 - Dan Čermák - -- Fix NPM version - -------------------------------------------------------------------- -Tue Dec 7 11:41:43 UTC 2021 - Dan Čermák - -- remove suse-build-key as a direct dependency, it will be pulled in indirectly anyway -- add update-alternatives package to allow building with ExpandFlags: kiwi-nobasepackages -- Fix title & description labels - -------------------------------------------------------------------- -Thu Sep 23 15:54:01 UTC 2021 - Dan Čermák - -- Bump npm version - -------------------------------------------------------------------- -Mon Sep 20 10:32:42 UTC 2021 - Dan Čermák - -- Fix container labels - -------------------------------------------------------------------- -Thu Sep 16 07:48:59 UTC 2021 - Dan Čermák - -- Fix environment variables - -------------------------------------------------------------------- -Tue Sep 14 13:15:14 UTC 2021 - Dan Čermák - -- First version of the NodeJS 14 container diff --git a/nodejs-14/nodejs-14.kiwi b/nodejs-14/nodejs-14.kiwi deleted file mode 100644 index f3611a57b..000000000 --- a/nodejs-14/nodejs-14.kiwi +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Node.js 14 Container Image - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/nodejs-16/_service b/nodejs-16/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/nodejs-16/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nodejs-16/config.sh b/nodejs-16/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/nodejs-16/config.sh +++ /dev/null @@ -1,30 +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/nodejs-16/nodejs-16.changes b/nodejs-16/nodejs-16.changes deleted file mode 100644 index d6db96624..000000000 --- a/nodejs-16/nodejs-16.changes +++ /dev/null @@ -1,54 +0,0 @@ -------------------------------------------------------------------- -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 - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:33 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:19:28 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Thu Apr 28 11:42:48 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:13:51 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:08:33 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:06 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:30:21 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:29:30 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Mon Feb 21 14:34:02 UTC 2022 - Dan Čermák - -- First version of the NodeJS 16 container diff --git a/nodejs-16/nodejs-16.kiwi b/nodejs-16/nodejs-16.kiwi deleted file mode 100644 index d4b0f701e..000000000 --- a/nodejs-16/nodejs-16.kiwi +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Node.js 16 Container Image - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/openjdk-11-devel/_constraints b/openjdk-11-devel/_constraints deleted file mode 100644 index df1320bf4..000000000 --- a/openjdk-11-devel/_constraints +++ /dev/null @@ -1,7 +0,0 @@ - - - - 6 - - - diff --git a/openjdk-11-devel/_service b/openjdk-11-devel/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/openjdk-11-devel/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/openjdk-11-devel/config.sh b/openjdk-11-devel/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/openjdk-11-devel/config.sh +++ /dev/null @@ -1,30 +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/openjdk-11-devel/openjdk-11-devel.changes b/openjdk-11-devel/openjdk-11-devel.changes deleted file mode 100644 index 91cbffee5..000000000 --- a/openjdk-11-devel/openjdk-11-devel.changes +++ /dev/null @@ -1,95 +0,0 @@ -------------------------------------------------------------------- -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 - -- Fix environment variables (bsc#1206128) - -------------------------------------------------------------------- -Wed Nov 23 10:07:43 UTC 2022 - Dan Čermák - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:46 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:19:42 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Fri Jun 10 13:49:34 UTC 2022 - Dan Čermák - -- Use exec form instead of shell form for CMD - -------------------------------------------------------------------- -Thu Apr 28 11:43:02 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:14:01 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label -- add _constraints file to request enough disk space - -------------------------------------------------------------------- -Wed Apr 20 14:08:41 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:13 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:30:33 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:30:26 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:42:49 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:06:50 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:21:45 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 14:28:37 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Jan 4 08:53:57 UTC 2022 - Dan Čermák - -- Fix description - -------------------------------------------------------------------- -Tue Dec 7 11:42:07 UTC 2021 - Dan Čermák - -- Fix title & description labels - -------------------------------------------------------------------- -Mon Sep 20 11:26:06 UTC 2021 - Dan Čermák - -- Fix container labels diff --git a/openjdk-11-devel/openjdk-11-devel.kiwi b/openjdk-11-devel/openjdk-11-devel.kiwi deleted file mode 100644 index 15af8ef1d..000000000 --- a/openjdk-11-devel/openjdk-11-devel.kiwi +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI OpenJDK 11 Development Container Image - - - - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - \ No newline at end of file diff --git a/openjdk-11/_constraints b/openjdk-11/_constraints deleted file mode 100644 index df1320bf4..000000000 --- a/openjdk-11/_constraints +++ /dev/null @@ -1,7 +0,0 @@ - - - - 6 - - - diff --git a/openjdk-11/_service b/openjdk-11/_service deleted file mode 100644 index 19923f6d9..000000000 --- a/openjdk-11/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/openjdk-11/config.sh b/openjdk-11/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/openjdk-11/config.sh +++ /dev/null @@ -1,30 +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/openjdk-11/openjdk-11.changes b/openjdk-11/openjdk-11.changes deleted file mode 100644 index 4d6fe1561..000000000 --- a/openjdk-11/openjdk-11.changes +++ /dev/null @@ -1,85 +0,0 @@ -------------------------------------------------------------------- -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 - -- Fix environment variables (bsc#1206128) - -------------------------------------------------------------------- -Wed Nov 23 10:10:18 UTC 2022 - Dan Čermák - -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:52:52 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:19:51 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Thu Apr 28 11:43:09 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:14:11 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label -- add _constraints file to request enough disk space - -------------------------------------------------------------------- -Wed Apr 20 14:08:48 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46: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 - -------------------------------------------------------------------- -Tue Mar 8 07:30:41 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:30:35 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:42:56 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:06:58 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:21:53 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 14:27:02 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Dec 7 11:42:15 UTC 2021 - Dan Čermák - -- Fix title & description labels - -------------------------------------------------------------------- -Mon Sep 20 11:22:21 UTC 2021 - Dan Čermák - -- Fix container labels diff --git a/openjdk-11/openjdk-11.kiwi b/openjdk-11/openjdk-11.kiwi deleted file mode 100644 index 230c54c2b..000000000 --- a/openjdk-11/openjdk-11.kiwi +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI OpenJDK 11 Runtime Container Image - - - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - \ No newline at end of file diff --git a/pcp-image/10-host_mount.conf.template b/pcp-image/10-host_mount.conf.template deleted file mode 100644 index 05ac34922..000000000 --- a/pcp-image/10-host_mount.conf.template +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) - -[Service] -Environment="PROC_STATSPATH=${HOST_MOUNT}" -Environment="PCP_PODMAN_DATADIR=${HOST_MOUNT}/var/lib/containers/storage/overlay-containers" -Environment="PCP_PODMAN_RUNDIR=${HOST_MOUNT}/run/containers/storage/overlay-containers" diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile deleted file mode 100644 index 11f97d564..000000000 --- a/pcp-image/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) -#!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 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.pcp -LABEL org.opencontainers.image.title="SLE Performance Co-Pilot (pcp) Container Image" -LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container image based on the SLE Base Container Image. This container image is not supported when using a container runtime other than podman." -LABEL org.opencontainers.image.version="%%pcp_patch%%" -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.opensuse.reference="registry.suse.com/suse/pcp:%%pcp_patch%%-%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" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends pcp hostname shadow gettext-runtime util-linux-systemd; zypper -n clean; rm -rf /var/log/* -ENTRYPOINT ["/usr/local/bin/container-entrypoint"] -CMD ["/usr/lib/systemd/systemd"] -VOLUME /var/log/pcp/pmlogger -EXPOSE 44321 44322 44323 - -RUN set -euo pipefail; mkdir -p /usr/share/container-scripts/pcp; mkdir -p /etc/sysconfig -COPY container-entrypoint healthcheck /usr/local/bin/ -RUN set -euo pipefail; chmod +x /usr/local/bin/container-entrypoint /usr/local/bin/healthcheck -COPY pmproxy.conf.template 10-host_mount.conf.template /usr/share/container-scripts/pcp/ -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 || : - -HEALTHCHECK --start-period=30s --timeout=20s --interval=10s --retries=3 CMD /usr/local/bin/healthcheck diff --git a/pcp-image/README.md b/pcp-image/README.md deleted file mode 100644 index 9e243bce1..000000000 --- a/pcp-image/README.md +++ /dev/null @@ -1,93 +0,0 @@ -# Performance Co-Pilot container - -Performance Co-Pilot ([PCP](https://pcp.io)) is a system performance analysis toolkit. - -## Usage - -``` -$ podman run -d \ - --name pcp \ - --systemd always \ - -p 44321:44321 \ - -p 44322:44322 \ - -v pcp-archives:/var/log/pcp/pmlogger \ - registry.suse.com/suse/pcp -``` - -**Note:** On SELinux enabled systems, the following boolean needs to be set: `sudo setsebool -P container_manage_cgroup true` - -### Enabling host processes, network and container metrics - -``` -$ sudo podman run -d \ - --name pcp \ - --privileged \ - --net host \ - --systemd always \ - -e HOST_MOUNT=/host \ - -v pcp-archives:/var/log/pcp/pmlogger \ - -v /:/host:ro,rslave \ - registry.suse.com/suse/pcp -``` - -## Configuration - -### Environment Variables - -#### `PCP_SERVICES` -Default: `pmcd,pmie,pmlogger,pmproxy` - -Comma-separated list of PCP services to start. - -#### `HOST_MOUNT` -Default: unset. - -Path inside the container to the bind mount of `/` on the host. - -#### `REDIS_SERVERS` -Default: `localhost:6379` - -Redis connection spec(s) - could be any individual cluster host, and all hosts in the cluster will be automatically discovered. -Alternately, use comma-separated hostspecs (non-clustered setup) - -### Configuration Files - -For custom configuration options beyond the above environment variables, it is advised to use a bind mount with a configuration file on the host to the container. -Example command to run a pmlogger-only container: - -``` -$ podman run -d \ - --name pmlogger \ - --systemd always \ - -e PCP_SERVICES=pmlogger \ - -v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \ - -v pcp-archives:/var/log/pcp/pmlogger \ - registry.suse.com/suse/pcp -``` - -pmlogger.control: -``` -$version=1.1 - -remote.pmcdhost.corp n n PCP_ARCHIVE_DIR/remote_pmcd -N -r -T24h10m -c config.default -v 100Mb -``` - -## Volumes - -### `/var/log/pcp/pmlogger` - -Performance Co-Pilot archive files with historical metrics. - -## Ports - -### `44321/tcp` - -The pmcd daemon listens on this port and exposes the [PMAPI(3)](https://man7.org/linux/man-pages/man3/pmapi.3.html) to access metrics. - -### `44322/tcp` - -The pmproxy daemon listens on this port and exposes the REST [PMWEBAPI(3)](https://man7.org/linux/man-pages/man3/pmwebapi.3.html) to access metrics. - -## Documentation - -[PCP books](https://pcp.readthedocs.io) diff --git a/pcp-image/_service b/pcp-image/_service deleted file mode 100644 index 12d4d1802..000000000 --- a/pcp-image/_service +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Dockerfile - %%pcp_major%% - pcp - major - - - Dockerfile - %%pcp_minor%% - pcp - minor - - - Dockerfile - %%pcp_patch%% - pcp - patch - - \ No newline at end of file diff --git a/pcp-image/container-entrypoint b/pcp-image/container-entrypoint deleted file mode 100644 index aaffb78bb..000000000 --- a/pcp-image/container-entrypoint +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -eu -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) - -ALL_PCP_SERVICES='pmcd,pmie,pmlogger,pmproxy' - -export PCP_SERVICES=${PCP_SERVICES:-${ALL_PCP_SERVICES}} -export HOST_MOUNT=${HOST_MOUNT:-''} -export REDIS_SERVERS=${REDIS_SERVERS:-'localhost:6379'} - -mkdir -p /etc/systemd/system/pmcd.service.d -# shellcheck disable=SC2016 -envsubst '$HOST_MOUNT' < /usr/share/container-scripts/pcp/10-host_mount.conf.template > /etc/systemd/system/pmcd.service.d/10-host_mount.conf -# shellcheck disable=SC2016 -envsubst '$REDIS_SERVERS' < /usr/share/container-scripts/pcp/pmproxy.conf.template > /etc/pcp/pmproxy/pmproxy.conf - -echo "Enabling PCP services: ${PCP_SERVICES}" -for service in ${ALL_PCP_SERVICES//,/ }; do - if [[ ",${PCP_SERVICES}," = *",${service},"* ]]; then - systemctl enable "${service}" 2> /dev/null - else - # pcp-zeroconf enables some PCP services already -> disable them if not requested - systemctl disable "${service}" 2> /dev/null - # prevent other services from starting (due to systemd dependencies) by masking them - systemctl mask "${service}" 2> /dev/null - fi -done - -# After systemd starts, something is creating syslinks in -# /var/lib/pcp/config/pmieconf/dm and /var/lib/pcp/config/pmieconf/zeroconf -# to the following non-existing locations. Pmie fails to start because of these broken links. -# Pmie starts okay if the targets are empty files, so this is a workaround for now. -mkdir -p /etc/pcp/pmieconf/dm -touch /etc/pcp/pmieconf/dm/data_high_util -touch /etc/pcp/pmieconf/dm/metadata_high_util -mkdir -p /etc/pcp/pmieconf/zeroconf -touch /etc/pcp/pmieconf/zeroconf/all_threads - -echo Starting systemd... -exec "$@" diff --git a/pcp-image/healthcheck b/pcp-image/healthcheck deleted file mode 100644 index 3c4ee97e7..000000000 --- a/pcp-image/healthcheck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -eu - -ALL_PCP_SERVICES='pmcd,pmie,pmlogger,pmproxy' -PCP_SERVICES=${PCP_SERVICES:-${ALL_PCP_SERVICES}} - -failed="" -for service in ${PCP_SERVICES//,/ }; do - if ! systemctl is-active $service --quiet; then - failed="$failed $service" - fi -done - -if [ ! -z "$failed" ]; then - echo "$0: services not active:$failed" - exit 1 -fi diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes deleted file mode 100644 index dde87d90c..000000000 --- a/pcp-image/pcp-image.changes +++ /dev/null @@ -1,54 +0,0 @@ -------------------------------------------------------------------- -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 - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Aug 19 10:24:51 UTC 2022 - Dan Čermák - -- Use obs-service-replace_using_package_version for the container version - -------------------------------------------------------------------- -Fri Jul 15 11:09:10 UTC 2022 - Dan Čermák - -- Correct org.opencontainers.image.title label - -------------------------------------------------------------------- -Fri Jun 17 09:18:38 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue Jun 14 10:10:50 UTC 2022 - Dan Čermák - -- Add HEALTHCHECK - -------------------------------------------------------------------- -Tue May 3 09:27:55 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Thu Apr 28 12:00:26 UTC 2022 - Dan Čermák - -- Add additional version tags 5 and 5.2 - -------------------------------------------------------------------- -Fri Apr 22 08:12:45 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:07:35 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Wed Apr 20 09:06:01 UTC 2022 - Dan Čermák - -- First version of the PCP container (jsc#SMO-91) diff --git a/pcp-image/pmcd b/pcp-image/pmcd deleted file mode 100644 index f340b8dde..000000000 --- a/pcp-image/pmcd +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) - -# Environment variables for the pmcd daemon. Refer also to the -# pmcd.options and pmcd.conf files for additional configuration. - -# Behaviour regarding listening on external-facing interfaces; -# unset PMCD_LOCAL to allow connections from remote hosts. -# A value of 0 permits remote connections, 1 permits local only. -PMCD_LOCAL=0 - -# Max length to which the queue of pending connections may grow -# A value of 5 is the default. -# PMCD_MAXPENDING=5 - -# Default behaviour regarding pmcd's approach to starting PMDAs; -# In cases where pmdaroot is available, setting this variable to -# 1, offloads starting and stopping of agents to pmdaroot. This -# allows pmcd to not require a restart when starting a new PMDA. -PMCD_ROOT_AGENT=1 - -# Default behaviour regarding pmcd's approach to re-starting any -# unresponsive PMDAs; this should only be used with pmdaroot and -# PMCD_ROOT_AGENT=1 as it allows pmcd to attempt to automatically -# restart any exited PMDA that it detects (which usually requires -# privileges not available to pmcd itself). -PMCD_RESTART_AGENTS=1 - -# Default timeout for waiting on pmcd to accept connections; any -# longer than this value and the rc scripts report it as failed. -# The value is a PCPIntro(1) interval in units of seconds and it -# will be passed directly to the pmcd_wait(1) utility. -# PMCD_WAIT_TIMEOUT=60 - -# Mode for pmcd to initialize the NSS certificate database when using -# secure connections. The default for pmcd is "readonly", as set here. -# If set to "readwrite" but fails, it will fallback and attempt readonly. -PCP_NSS_INIT_MODE=readonly diff --git a/pcp-image/pmlogger b/pcp-image/pmlogger deleted file mode 100644 index 861dade45..000000000 --- a/pcp-image/pmlogger +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) - -# Environment variables for the primary pmlogger daemon. See also -# the pmlogger control file and pmlogconf(1) for additional details. - -# Behaviour regarding listening on external-facing interfaces; -# unset PMLOGGER_LOCAL to allow connections from remote hosts. -# A value of 0 permits remote connections, 1 permits local only. -PMLOGGER_LOCAL=1 - -# Max length to which the queue of pending connections may grow -# A value of 5 is the default. -# PMLOGGER_MAXPENDING=5 - -# Default sampling interval pmlogger uses when no more specific -# interval is requested. A value of 60 seconds is the default. -# Both pmlogger command line (via control file) and also pmlogger -# configuration file directives will override this value. -PMLOGGER_INTERVAL=10 - -# The default behaviour, when pmlogger configuration comes from -# pmlogconf(1), is to regenerate the configuration file and check for -# changes whenever pmlogger is started from pmlogger_check(1). -# If the PMDA configuration is stable, this is not necessary, and -# setting PMLOGGER_CHECK_SKIP_LOGCONF to yes disables the regeneration -# and checking. -# PMLOGGER_CHECK_SKIP_LOGCONF=yes diff --git a/pcp-image/pmproxy.conf.template b/pcp-image/pmproxy.conf.template deleted file mode 100644 index c15500c1c..000000000 --- a/pcp-image/pmproxy.conf.template +++ /dev/null @@ -1,87 +0,0 @@ -# SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+) - -# configuration options for pmproxy, pmseries and associated APIs -# uncomment/edit lines as required - -##################################################################### -## general settings for the pmproxy(1) daemon -##################################################################### -[pmproxy] - -# settings related to TLS certificates and keys -#certificates = /etc/pki/tls/certs/pcp.crt -#private_key = /etc/pki/tls/private/pcp.key -#authority = # PEM format file of acceptable client CAs -#cipher_list = # (TLSv2) colon-separated cipher list to be used -#cipher_suites = # (TLSv3) colon-separated cipher suites to be used - -# maximum pending socket opens -#maxpending = 128 - -# delay in seconds for TCP keep-alive (zero to disable) -#keepalive = 45 - -# buffer size for chunked transfer encoding (bytes, default pagesize) -#chunksize = 4096 - -# support PCP protocol proxying -pcp.enabled = true - -# serve the PCP REST APIs (HTTP) -http.enabled = true - -# support Redis protocol proxying -redis.enabled = true - -# support SSL/TLS protocol wrapping -secure.enabled = true - - -##################################################################### -## settings related to automatically discovered archives -##################################################################### -[discover] - -# propogate archives from pmlogger(1) into Redis querying -enabled = true - -# comma-separated metrics name (globs) to skip during discovery -exclude.metrics = proc.*,acct.* - -# comma-separated list of instance domains to skip during discovery -exclude.indoms = 3.9,3.40,79.7 - -##################################################################### -## settings for metric and indom help text searching via RediSearch -[pmsearch] -##################################################################### - -# allow REST API queries and indexing of metric and indom help text -enabled = true - -# default number of query results in a batch (paginated) -count = 10 - -##################################################################### -## settings for fast, scalable time series quering via Redis -[pmseries] -##################################################################### - -# allow REST API queries of fast, scalable time series -enabled = true - -# Redis connection spec(s) - could be any individual cluster host, -# and all hosts in the cluster will be automatically discovered -- -# alternately, use comma-separated hostspecs (non-clustered setup) -servers = ${REDIS_SERVERS} - -# number of elements from scan calls (https://redis.io/commands/scan) -cursor.count = 256 - -# seconds to expire in-core series (https://redis.io/commands/expire) -stream.expire = 86400 - -# limit number of elements in series (https://redis.io/commands/xadd) -stream.maxlen = 8640 - -##################################################################### diff --git a/python-3.6/_service b/python-3.6/_service deleted file mode 100644 index edffd208d..000000000 --- a/python-3.6/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - - - python-3.6.kiwi - %%py36_ver%% - python3-base - - - python-3.6.kiwi - %%pip_ver%% - python3-pip - - \ No newline at end of file diff --git a/python-3.6/config.sh b/python-3.6/config.sh deleted file mode 100644 index 531a4e200..000000000 --- a/python-3.6/config.sh +++ /dev/null @@ -1,30 +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/python-3.6/python-3.6.changes b/python-3.6/python-3.6.changes deleted file mode 100644 index e471f85d6..000000000 --- a/python-3.6/python-3.6.changes +++ /dev/null @@ -1,90 +0,0 @@ -------------------------------------------------------------------- -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 - -- Add main python package to include bundled modules (fixes bsc#1205850) - -------------------------------------------------------------------- -Tue Nov 22 11:34:49 UTC 2022 - Dirk Mueller - -- Add the devel package into the container to prevent dependency issues on maintenance updates -- Set supportlevel to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:51:44 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Thu Apr 28 11:41:32 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:12:16 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:07:09 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Wed Apr 13 09:17:01 UTC 2022 - Dan Čermák - -- Sync the variable names with the generator - -------------------------------------------------------------------- -Tue Apr 12 08:44:46 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:28:53 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:28:18 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Tue Feb 15 09:42:12 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Tue Feb 8 16:20:49 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 14:13:30 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Wed Jan 5 12:52:53 UTC 2022 - Dan Čermák - -- Fix python version - -------------------------------------------------------------------- -Tue Dec 7 11:43:35 UTC 2021 - Dan Čermák - -- Fix title & description labels - -------------------------------------------------------------------- -Mon Sep 20 10:34:04 UTC 2021 - Dan Čermák - -- Fix container labels - -------------------------------------------------------------------- -Wed Sep 15 07:49:16 UTC 2021 - Dan Čermák - -- First version of the python 3.6 language stack container diff --git a/python-3.6/python-3.6.kiwi b/python-3.6/python-3.6.kiwi deleted file mode 100644 index 768fde94a..000000000 --- a/python-3.6/python-3.6.kiwi +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Python 3.6 Container Image - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - - \ No newline at end of file diff --git a/python-3.9/_service b/python-3.9/_service deleted file mode 100644 index 3948d0835..000000000 --- a/python-3.9/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - - - python-3.9.kiwi - %%py39_ver%% - python39-base - - - python-3.9.kiwi - %%pip_ver%% - python39-pip - - \ No newline at end of file diff --git a/python-3.9/config.sh b/python-3.9/config.sh deleted file mode 100644 index 7b823ef7d..000000000 --- a/python-3.9/config.sh +++ /dev/null @@ -1,34 +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 - -ln -s /usr/bin/pip3.9 /usr/local/bin/pip3; \ - ln -s /usr/bin/pip3.9 /usr/local/bin/pip; \ - ln -s /usr/bin/python3.9 /usr/local/bin/python3; \ - ln -s /usr/bin/pydoc3.9 /usr/local/bin/pydoc - - -#======================================= -# 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/python-3.9/python-3.9.changes b/python-3.9/python-3.9.changes deleted file mode 100644 index bc646861e..000000000 --- a/python-3.9/python-3.9.changes +++ /dev/null @@ -1,115 +0,0 @@ -------------------------------------------------------------------- -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 - -- Add main python package to include bundled modules (fixes bsc#1205850) - -------------------------------------------------------------------- -Tue Nov 22 11:34:49 UTC 2022 - Dirk Mueller - -- Add the devel package into the container to prevent dependency issues on maintenance updates - -------------------------------------------------------------------- -Tue Oct 25 09:32:22 UTC 2022 - Bruno Leon - -- Set Support Level to l3 - -------------------------------------------------------------------- -Mon Sep 26 14:51:50 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:18:15 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:33:59 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures, do not uninstall python3-base - -------------------------------------------------------------------- -Thu Apr 28 11:41:41 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:12:26 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:07:17 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Wed Apr 20 09:05:22 UTC 2022 - Dan Čermák - -- Symlink into /usr/local/bin - -------------------------------------------------------------------- -Wed Apr 13 09:16:43 UTC 2022 - Dan Čermák - -- Symlink remaining binaries in /usr/bin/ - -------------------------------------------------------------------- -Tue Apr 12 08:44:54 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:29:01 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:28:28 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel -- Add additional tag '3' - -------------------------------------------------------------------- -Tue Feb 15 09:42:19 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:06:04 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:20:57 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 14:15:27 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Dec 7 11:44:37 UTC 2021 - Dan Čermák - -- Fix title & description labels - -------------------------------------------------------------------- -Mon Sep 20 10:33:24 UTC 2021 - Dan Čermák - -- Fix container labels - -------------------------------------------------------------------- -Thu Sep 16 13:12:05 UTC 2021 - Dan Čermák - -- Add monkey patch of python3 & pip3 to work around bsc#1190568 - -------------------------------------------------------------------- -Wed Sep 15 08:10:11 UTC 2021 - Dan Čermák - -- First version of the python 3.9 language stack container diff --git a/python-3.9/python-3.9.kiwi b/python-3.9/python-3.9.kiwi deleted file mode 100644 index 1e5771ed8..000000000 --- a/python-3.9/python-3.9.kiwi +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Python 3.9 Container Image - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/rmt-mariadb-client/Dockerfile b/rmt-mariadb-client/Dockerfile deleted file mode 100644 index 1c23b6498..000000000 --- a/rmt-mariadb-client/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: MIT -#!BuildTag: suse/rmt-mariadb-client:%%mariadb_version%% -#!BuildTag: suse/rmt-mariadb-client:%%mariadb_version%%-%RELEASE% - -FROM suse/sle15:15.3 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.rmt-mariadb-client -LABEL org.opencontainers.image.title="SLE MariaDB Client Container Image" -LABEL org.opencontainers.image.description="MariaDB client for RMT, based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%mariadb_version%%" -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.opensuse.reference="registry.suse.com/suse/rmt-mariadb-client:%%mariadb_version%%-%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" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n clean; rm -rf /var/log/* -CMD ["mariadb"] diff --git a/rmt-mariadb-client/_service b/rmt-mariadb-client/_service deleted file mode 100644 index d6912aad0..000000000 --- a/rmt-mariadb-client/_service +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Dockerfile - %%mariadb_version%% - mariadb-client - minor - - \ No newline at end of file diff --git a/rmt-mariadb-client/rmt-mariadb-client.changes b/rmt-mariadb-client/rmt-mariadb-client.changes deleted file mode 100644 index c8c015308..000000000 --- a/rmt-mariadb-client/rmt-mariadb-client.changes +++ /dev/null @@ -1,56 +0,0 @@ -------------------------------------------------------------------- -Mon Sep 26 14:53:10 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Aug 19 10:25:11 UTC 2022 - Dan Čermák - -- Use obs-service-replace_using_package_version for the container version - -------------------------------------------------------------------- -Fri Jun 17 09:20:14 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:28:54 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:14:43 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:09:14 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:44 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:13:24 UTC 2022 - Dan Čermák - -- Fix quotes in CMD -- Correct command from "mariadbd" to "mariadb" - -------------------------------------------------------------------- -Tue Mar 8 07:31:04 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:37:42 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 10:59:21 UTC 2022 - Dan Čermák - -- Add SPDX license identifier & correct version, labels & cleanup /var/log diff --git a/rmt-mariadb/Dockerfile b/rmt-mariadb/Dockerfile deleted file mode 100644 index d2cd06fe1..000000000 --- a/rmt-mariadb/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: MIT -#!BuildTag: suse/rmt-mariadb:%%mariadb_version%% -#!BuildTag: suse/rmt-mariadb:%%mariadb_version%%-%RELEASE% - -FROM suse/sle15:15.3 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.rmt-mariadb -LABEL org.opencontainers.image.title="SLE MariaDB Server Container Image" -LABEL org.opencontainers.image.description="MariaDB server for RMT, based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%mariadb_version%%" -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.opensuse.reference="registry.suse.com/suse/rmt-mariadb:%%mariadb_version%%-%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" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux; zypper -n clean; rm -rf /var/log/* -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["mariadbd"] -VOLUME /var/lib/mysql -EXPOSE 3306 -RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d - -# docker-entrypoint from https://github.com/MariaDB/mariadb-docker.git -COPY docker-entrypoint.sh /usr/local/bin/ -RUN set -euo pipefail; chmod 755 /usr/local/bin/docker-entrypoint.sh -RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat - -RUN set -euo pipefail; sed -i 's#gosu mysql#su mysql -s /bin/bash -m#g' /usr/local/bin/docker-entrypoint.sh - -# Ensure all logs goes to stdout -RUN set -euo pipefail; sed -i 's/^log/#log/g' /etc/my.cnf - -# Disable binding to localhost only, doesn't make sense in a container -RUN set -euo pipefail; sed -i -e 's|^\(bind-address.*\)|#\1|g' /etc/my.cnf - -RUN set -euo pipefail; mkdir /run/mysql diff --git a/rmt-mariadb/_service b/rmt-mariadb/_service deleted file mode 100644 index 827b9b1cf..000000000 --- a/rmt-mariadb/_service +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Dockerfile - %%mariadb_version%% - mariadb - minor - - \ No newline at end of file diff --git a/rmt-mariadb/docker-entrypoint.sh b/rmt-mariadb/docker-entrypoint.sh deleted file mode 100644 index 8774deb68..000000000 --- a/rmt-mariadb/docker-entrypoint.sh +++ /dev/null @@ -1,400 +0,0 @@ -#!/bin/bash -set -eo pipefail -shopt -s nullglob - -# logging functions -mysql_log() { - local type="$1"; shift - printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*" -} -mysql_note() { - mysql_log Note "$@" -} -mysql_warn() { - mysql_log Warn "$@" >&2 -} -mysql_error() { - mysql_log ERROR "$@" >&2 - exit 1 -} - -# 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 - mysql_error "Both $var and $fileVar are set (but are exclusive)" - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -# set MARIADB_xyz from MYSQL_xyz when MARIADB_xyz is unset -# and make them the same value (so user scripts can use either) -_mariadb_file_env() { - local var="$1"; shift - local maria="MARIADB_${var#MYSQL_}" - file_env "$var" "$@" - file_env "$maria" "${!var}" - if [ "${!maria:-}" ]; then - export "$var"="${!maria}" - fi -} - -# 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' ] -} - -# usage: docker_process_init_files [file [file [...]]] -# ie: docker_process_init_files /always-initdb.d/* -# process initializer files, based on file extensions -docker_process_init_files() { - # mysql here for backwards compatibility "${mysql[@]}" - mysql=( docker_process_sql ) - - echo - 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 - mysql_note "$0: running $f" - "$f" - else - mysql_note "$0: sourcing $f" - . "$f" - fi - ;; - *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; - *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;; - *) mysql_warn "$0: ignoring $f" ;; - esac - echo - done -} - -# arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) -_verboseHelpArgs=( - --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 -) - -mysql_check_config() { - local toRun=( "$@" "${_verboseHelpArgs[@]}" ) errors - if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then - mysql_error $'mysqld failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors" - fi -} - -# Fetch value from server config -# We use mysqld --verbose --help instead of my_print_defaults because the -# latter only show values present in config files, and not server defaults -mysql_get_config() { - local conf="$1"; shift - "$@" "${_verboseHelpArgs[@]}" 2>/dev/null \ - | awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }' - # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" -} - -# Do a temporary startup of the MariaDB server, for init purposes -docker_temp_server_start() { - "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF & - mysql_note "Waiting for server startup" - # only use the root password if the database has already been initializaed - # so that it won't try to fill in a password file when it hasn't been set yet - extraArgs=() - if [ -z "$DATABASE_ALREADY_EXISTS" ]; then - extraArgs+=( '--dont-use-mysql-root-password' ) - fi - local i - for i in {30..0}; do - if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then - break - fi - sleep 1 - done - if [ "$i" = 0 ]; then - mysql_error "Unable to start server." - fi -} - -# Stop the server. When using a local socket file mysqladmin will block until -# the shutdown is complete. -docker_temp_server_stop() { - if ! MYSQL_PWD=$MARIADB_ROOT_PASSWORD mysqladmin shutdown -uroot --socket="${SOCKET}"; then - mysql_error "Unable to shut down server." - fi -} - -# Verify that the minimally required password settings are set for new databases. -docker_verify_minimum_env() { - if [ -z "$MARIADB_ROOT_PASSWORD" -a -z "$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" -a -z "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then - mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MARIADB_ROOT_PASSWORD, MARIADB_ALLOW_EMPTY_ROOT_PASSWORD and MARIADB_RANDOM_ROOT_PASSWORD' - fi -} - -# creates folders for the database -# also ensures permission for user mysql of run as root -docker_create_db_directories() { - local user; user="$(id -u)" - - # TODO other directories that are used by default? like /var/lib/mysql-files - # see https://github.com/docker-library/mysql/issues/562 - mkdir -p "$DATADIR" - - if [ "$user" = "0" ]; then - # this will cause less disk access than `chown -R` - find "$DATADIR" \! -user mysql -exec chown mysql '{}' + - # See https://github.com/MariaDB/mariadb-docker/issues/363 - find "${SOCKET%/*}" -maxdepth 0 \! -user mysql -exec chown mysql '{}' \; - fi -} - -# initializes the database directory -docker_init_database_dir() { - mysql_note "Initializing database files" - installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) - if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then - # 10.3+ - installArgs+=( --skip-test-db ) - fi - # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) - mysql_install_db "${installArgs[@]}" "${@:2}" --default-time-zone=SYSTEM --enforce-storage-engine= - mysql_note "Database files initialized" -} - -# Loads various settings that are used elsewhere in the script -# This should be called after mysql_check_config, but before any other functions -docker_setup_env() { - # Get config - declare -g DATADIR SOCKET - DATADIR="$(mysql_get_config 'datadir' "$@")" - SOCKET="$(mysql_get_config 'socket' "$@")" - - - # Initialize values that might be stored in a file - _mariadb_file_env 'MYSQL_ROOT_HOST' '%' - _mariadb_file_env 'MYSQL_DATABASE' - _mariadb_file_env 'MYSQL_USER' - _mariadb_file_env 'MYSQL_PASSWORD' - _mariadb_file_env 'MYSQL_ROOT_PASSWORD' - - # set MARIADB_ from MYSQL_ when it is unset and then make them the same value - : "${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:=${MYSQL_ALLOW_EMPTY_PASSWORD:-}}" - export MYSQL_ALLOW_EMPTY_PASSWORD="$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" MARIADB_ALLOW_EMPTY_ROOT_PASSWORD - : "${MARIADB_RANDOM_ROOT_PASSWORD:=${MYSQL_RANDOM_ROOT_PASSWORD:-}}" - export MYSQL_RANDOM_ROOT_PASSWORD="$MARIADB_RANDOM_ROOT_PASSWORD" MARIADB_RANDOM_ROOT_PASSWORD - : "${MARIADB_INITDB_SKIP_TZINFO:=${MYSQL_INITDB_SKIP_TZINFO:-}}" - export MYSQL_INITDB_SKIP_TZINFO="$MARIADB_INITDB_SKIP_TZINFO" MARIADB_INITDB_SKIP_TZINFO - - declare -g DATABASE_ALREADY_EXISTS - if [ -d "$DATADIR/mysql" ]; then - DATABASE_ALREADY_EXISTS='true' - fi -} - -# Execute the client, use via docker_process_sql to handle root password -docker_exec_client() { - # args sent in can override this db, since they will be later in the command - if [ -n "$MYSQL_DATABASE" ]; then - set -- --database="$MYSQL_DATABASE" "$@" - fi - mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" "$@" -} - -# Execute sql script, passed via stdin -# usage: docker_process_sql [--dont-use-mysql-root-password] [mysql-cli-args] -# ie: docker_process_sql --database=mydb <<<'INSERT ...' -# ie: docker_process_sql --dont-use-mysql-root-password --database=mydb /dev/null - - docker_init_database_dir "$@" - - mysql_note "Starting temporary server" - docker_temp_server_start "$@" - mysql_note "Temporary server started." - - docker_setup_db - docker_process_init_files /docker-entrypoint-initdb.d/* - - mysql_note "Stopping temporary server" - docker_temp_server_stop - mysql_note "Temporary server stopped" - - echo - mysql_note "MariaDB init process done. Ready for start up." - echo - fi - fi - exec "$@" -} - -# If we are sourced from elsewhere, don't perform any further actions -if ! _is_sourced; then - _main "$@" -fi diff --git a/rmt-mariadb/rmt-mariadb.changes b/rmt-mariadb/rmt-mariadb.changes deleted file mode 100644 index 8597b9915..000000000 --- a/rmt-mariadb/rmt-mariadb.changes +++ /dev/null @@ -1,55 +0,0 @@ -------------------------------------------------------------------- -Mon Sep 26 14:53:04 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Aug 19 10:25:04 UTC 2022 - Dan Čermák - -- Use obs-service-replace_using_package_version for the container version - -------------------------------------------------------------------- -Fri Jun 17 09:20:07 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:28:48 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Fri Apr 22 08:14:33 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:09:05 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:46:37 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:13:15 UTC 2022 - Dan Čermák - -- Fix quotes in CMD and ENTRYPOINT - -------------------------------------------------------------------- -Tue Mar 8 07:30: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:30:53 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 10:55:48 UTC 2022 - Dan Čermák - -- Add SPDX license identifier & correct version, labels & cleanup /var/log diff --git a/rmt-nginx/10-listen-on-ipv6-by-default.sh b/rmt-nginx/10-listen-on-ipv6-by-default.sh deleted file mode 100644 index b2655860d..000000000 --- a/rmt-nginx/10-listen-on-ipv6-by-default.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# vim:sw=4:ts=4:et - -set -e - -entrypoint_log() { - if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then - echo "$@" - fi -} - -ME=$(basename $0) -DEFAULT_CONF_FILE="etc/nginx/conf.d/default.conf" - -# check if we have ipv6 available -if [ ! -f "/proc/net/if_inet6" ]; then - entrypoint_log "$ME: info: ipv6 not available" - exit 0 -fi - -if [ ! -f "/$DEFAULT_CONF_FILE" ]; then - entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE is not a file or does not exist" - exit 0 -fi - -# check if the file can be modified, e.g. not on a r/o filesystem -touch /$DEFAULT_CONF_FILE 2>/dev/null || { entrypoint_log "$ME: info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)"; exit 0; } - -# check if the file is already modified, e.g. on a container restart -grep -q "listen \[::]\:80;" /$DEFAULT_CONF_FILE && { entrypoint_log "$ME: info: IPv6 listen already enabled"; exit 0; } - -if [ -f "/etc/os-release" ]; then - . /etc/os-release -else - entrypoint_log "$ME: info: can not guess the operating system" - exit 0 -fi - -entrypoint_log "$ME: info: Getting the checksum of /$DEFAULT_CONF_FILE" - -case "$ID" in - "debian") - CHECKSUM=$(dpkg-query --show --showformat='${Conffiles}\n' nginx | grep $DEFAULT_CONF_FILE | cut -d' ' -f 3) - echo "$CHECKSUM /$DEFAULT_CONF_FILE" | md5sum -c - >/dev/null 2>&1 || { - entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version" - exit 0 - } - ;; - "alpine") - CHECKSUM=$(apk manifest nginx 2>/dev/null| grep $DEFAULT_CONF_FILE | cut -d' ' -f 1 | cut -d ':' -f 2) - echo "$CHECKSUM /$DEFAULT_CONF_FILE" | sha1sum -c - >/dev/null 2>&1 || { - entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version" - exit 0 - } - ;; - *) - entrypoint_log "$ME: info: Unsupported distribution" - exit 0 - ;; -esac - -# enable ipv6 on default.conf listen sockets -sed -i -E 's,listen 80;,listen 80;\n listen [::]:80;,' /$DEFAULT_CONF_FILE - -entrypoint_log "$ME: info: Enabled listen on IPv6 in /$DEFAULT_CONF_FILE" - -exit 0 diff --git a/rmt-nginx/20-envsubst-on-templates.sh b/rmt-nginx/20-envsubst-on-templates.sh deleted file mode 100644 index d0398b1e1..000000000 --- a/rmt-nginx/20-envsubst-on-templates.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -ME=$(basename $0) - -entrypoint_log() { - if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then - echo "$@" - fi -} - -auto_envsubst() { - local template_dir="${NGINX_ENVSUBST_TEMPLATE_DIR:-/etc/nginx/templates}" - local suffix="${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.template}" - local output_dir="${NGINX_ENVSUBST_OUTPUT_DIR:-/etc/nginx/conf.d}" - local filter="${NGINX_ENVSUBST_FILTER:-}" - - local template defined_envs relative_path output_path subdir - defined_envs=$(printf '${%s} ' $(awk "END { for (name in ENVIRON) { print ( name ~ /${filter}/ ) ? name : \"\" } }" < /dev/null )) - [ -d "$template_dir" ] || return 0 - if [ ! -w "$output_dir" ]; then - entrypoint_log "$ME: ERROR: $template_dir exists, but $output_dir is not writable" - return 0 - fi - find "$template_dir" -follow -type f -name "*$suffix" -print | while read -r template; do - relative_path="${template#$template_dir/}" - output_path="$output_dir/${relative_path%$suffix}" - subdir=$(dirname "$relative_path") - # create a subdirectory where the template file exists - mkdir -p "$output_dir/$subdir" - entrypoint_log "$ME: Running envsubst on $template to $output_path" - envsubst "$defined_envs" < "$template" > "$output_path" - done -} - -auto_envsubst - -exit 0 diff --git a/rmt-nginx/30-tune-worker-processes.sh b/rmt-nginx/30-tune-worker-processes.sh deleted file mode 100644 index 9aa42e98d..000000000 --- a/rmt-nginx/30-tune-worker-processes.sh +++ /dev/null @@ -1,188 +0,0 @@ -#!/bin/sh -# vim:sw=2:ts=2:sts=2:et - -set -eu - -LC_ALL=C -ME=$( basename "$0" ) -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - -[ "${NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE:-}" ] || exit 0 - -touch /etc/nginx/nginx.conf 2>/dev/null || { echo >&2 "$ME: error: can not modify /etc/nginx/nginx.conf (read-only file system?)"; exit 0; } - -ceildiv() { - num=$1 - div=$2 - echo $(( (num + div - 1) / div )) -} - -get_cpuset() { - cpusetroot=$1 - cpusetfile=$2 - ncpu=0 - [ -f "$cpusetroot/$cpusetfile" ] || return 1 - for token in $( tr ',' ' ' < "$cpusetroot/$cpusetfile" ); do - case "$token" in - *-*) - count=$( seq $(echo "$token" | tr '-' ' ') | wc -l ) - ncpu=$(( ncpu+count )) - ;; - *) - ncpu=$(( ncpu+1 )) - ;; - esac - done - echo "$ncpu" -} - -get_quota() { - cpuroot=$1 - ncpu=0 - [ -f "$cpuroot/cpu.cfs_quota_us" ] || return 1 - [ -f "$cpuroot/cpu.cfs_period_us" ] || return 1 - cfs_quota=$( cat "$cpuroot/cpu.cfs_quota_us" ) - cfs_period=$( cat "$cpuroot/cpu.cfs_period_us" ) - [ "$cfs_quota" = "-1" ] && return 1 - [ "$cfs_period" = "0" ] && return 1 - ncpu=$( ceildiv "$cfs_quota" "$cfs_period" ) - [ "$ncpu" -gt 0 ] || return 1 - echo "$ncpu" -} - -get_quota_v2() { - cpuroot=$1 - ncpu=0 - [ -f "$cpuroot/cpu.max" ] || return 1 - cfs_quota=$( cut -d' ' -f 1 < "$cpuroot/cpu.max" ) - cfs_period=$( cut -d' ' -f 2 < "$cpuroot/cpu.max" ) - [ "$cfs_quota" = "max" ] && return 1 - [ "$cfs_period" = "0" ] && return 1 - ncpu=$( ceildiv "$cfs_quota" "$cfs_period" ) - [ "$ncpu" -gt 0 ] || return 1 - echo "$ncpu" -} - -get_cgroup_v1_path() { - needle=$1 - found= - foundroot= - mountpoint= - - [ -r "/proc/self/mountinfo" ] || return 1 - [ -r "/proc/self/cgroup" ] || return 1 - - while IFS= read -r line; do - case "$needle" in - "cpuset") - case "$line" in - *cpuset*) - found=$( echo "$line" | cut -d ' ' -f 4,5 ) - break - ;; - esac - ;; - "cpu") - case "$line" in - *cpuset*) - ;; - *cpu,cpuacct*|*cpuacct,cpu|*cpuacct*|*cpu*) - found=$( echo "$line" | cut -d ' ' -f 4,5 ) - break - ;; - esac - esac - done << __EOF__ -$( grep -F -- '- cgroup ' /proc/self/mountinfo ) -__EOF__ - - while IFS= read -r line; do - controller=$( echo "$line" | cut -d: -f 2 ) - case "$needle" in - "cpuset") - case "$controller" in - cpuset) - mountpoint=$( echo "$line" | cut -d: -f 3 ) - break - ;; - esac - ;; - "cpu") - case "$controller" in - cpu,cpuacct|cpuacct,cpu|cpuacct|cpu) - mountpoint=$( echo "$line" | cut -d: -f 3 ) - break - ;; - esac - ;; - esac -done << __EOF__ -$( grep -F -- 'cpu' /proc/self/cgroup ) -__EOF__ - - case "${found%% *}" in - "/") - foundroot="${found##* }$mountpoint" - ;; - "$mountpoint") - foundroot="${found##* }" - ;; - esac - echo "$foundroot" -} - -get_cgroup_v2_path() { - found= - foundroot= - mountpoint= - - [ -r "/proc/self/mountinfo" ] || return 1 - [ -r "/proc/self/cgroup" ] || return 1 - - while IFS= read -r line; do - found=$( echo "$line" | cut -d ' ' -f 4,5 ) - done << __EOF__ -$( grep -F -- '- cgroup2 ' /proc/self/mountinfo ) -__EOF__ - - while IFS= read -r line; do - mountpoint=$( echo "$line" | cut -d: -f 3 ) -done << __EOF__ -$( grep -F -- '0::' /proc/self/cgroup ) -__EOF__ - - case "${found%% *}" in - "") - return 1 - ;; - "/") - foundroot="${found##* }$mountpoint" - ;; - "$mountpoint" | /../*) - foundroot="${found##* }" - ;; - esac - echo "$foundroot" -} - -ncpu_online=$( getconf _NPROCESSORS_ONLN ) -ncpu_cpuset= -ncpu_quota= -ncpu_cpuset_v2= -ncpu_quota_v2= - -cpuset=$( get_cgroup_v1_path "cpuset" ) && ncpu_cpuset=$( get_cpuset "$cpuset" "cpuset.effective_cpus" ) || ncpu_cpuset=$ncpu_online -cpu=$( get_cgroup_v1_path "cpu" ) && ncpu_quota=$( get_quota "$cpu" ) || ncpu_quota=$ncpu_online -cgroup_v2=$( get_cgroup_v2_path ) && ncpu_cpuset_v2=$( get_cpuset "$cgroup_v2" "cpuset.cpus.effective" ) || ncpu_cpuset_v2=$ncpu_online -cgroup_v2=$( get_cgroup_v2_path ) && ncpu_quota_v2=$( get_quota_v2 "$cgroup_v2" ) || ncpu_quota_v2=$ncpu_online - -ncpu=$( printf "%s\n%s\n%s\n%s\n%s\n" \ - "$ncpu_online" \ - "$ncpu_cpuset" \ - "$ncpu_quota" \ - "$ncpu_cpuset_v2" \ - "$ncpu_quota_v2" \ - | sort -n \ - | head -n 1 ) - -sed -i.bak -r 's/^(worker_processes)(.*)$/# Commented out by '"$ME"' on '"$(date)"'\n#\1\2\n\1 '"$ncpu"';/' /etc/nginx/nginx.conf diff --git a/rmt-nginx/Dockerfile b/rmt-nginx/Dockerfile deleted file mode 100644 index 821f0c39b..000000000 --- a/rmt-nginx/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: MIT -#!BuildTag: suse/rmt-nginx:%%nginx_version%% -#!BuildTag: suse/rmt-nginx:%%nginx_version%%-%RELEASE% - -FROM suse/sle15:15.3 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.rmt-nginx -LABEL org.opencontainers.image.title="SLE RMT Nginx Container Image" -LABEL org.opencontainers.image.description="RMT Nginx based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%nginx_version%%" -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.opensuse.reference="registry.suse.com/suse/rmt-nginx:%%nginx_version%%-%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" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends nginx distribution-release; zypper -n clean; rm -rf /var/log/* -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["nginx", "-g", "daemon off;"] -EXPOSE 80 -RUN set -euo pipefail; mkdir /docker-entrypoint.d -COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/ -COPY 20-envsubst-on-templates.sh /docker-entrypoint.d/ -COPY 30-tune-worker-processes.sh /docker-entrypoint.d/ -COPY docker-entrypoint.sh / -RUN set -euo pipefail; chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh -RUN set -euo pipefail; chmod +x /docker-entrypoint.d/20-envsubst-on-templates.sh -RUN set -euo pipefail; chmod +x /docker-entrypoint.d/30-tune-worker-processes.sh -RUN set -euo pipefail; chmod +x /docker-entrypoint.sh - -COPY index.html /srv/www/htdocs/ - -RUN set -euo pipefail; mkdir /var/log/nginx -RUN set -euo pipefail; chown nginx:nginx /var/log/nginx -RUN set -euo pipefail; ln -sf /dev/stdout /var/log/nginx/access.log -RUN set -euo pipefail; ln -sf /dev/stderr /var/log/nginx/error.log - -STOPSIGNAL SIGQUIT diff --git a/rmt-nginx/LICENSE b/rmt-nginx/LICENSE deleted file mode 100644 index bc1d673f0..000000000 --- a/rmt-nginx/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (C) 2011-2016 Nginx, Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/rmt-nginx/_service b/rmt-nginx/_service deleted file mode 100644 index 3b6c43fad..000000000 --- a/rmt-nginx/_service +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Dockerfile - %%nginx_version%% - nginx - minor - - \ No newline at end of file diff --git a/rmt-nginx/docker-entrypoint.sh b/rmt-nginx/docker-entrypoint.sh deleted file mode 100644 index e201fe608..000000000 --- a/rmt-nginx/docker-entrypoint.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# vim:sw=4:ts=4:et - -set -e - -entrypoint_log() { - if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then - echo "$@" - fi -} - -if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then - if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then - entrypoint_log "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration" - - entrypoint_log "$0: Looking for shell scripts in /docker-entrypoint.d/" - find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do - case "$f" in - *.envsh) - if [ -x "$f" ]; then - entrypoint_log "$0: Sourcing $f"; - . "$f" - else - # warn on shell scripts without exec bit - entrypoint_log "$0: Ignoring $f, not executable"; - fi - ;; - *.sh) - if [ -x "$f" ]; then - entrypoint_log "$0: Launching $f"; - "$f" - else - # warn on shell scripts without exec bit - entrypoint_log "$0: Ignoring $f, not executable"; - fi - ;; - *) entrypoint_log "$0: Ignoring $f";; - esac - done - - entrypoint_log "$0: Configuration complete; ready for start up" - else - entrypoint_log "$0: No files found in /docker-entrypoint.d/, skipping configuration" - fi -fi - -exec "$@" diff --git a/rmt-nginx/index.html b/rmt-nginx/index.html deleted file mode 100644 index 4be195920..000000000 --- a/rmt-nginx/index.html +++ /dev/null @@ -1,18 +0,0 @@ - - - -Welcome to nginx! - - - -

Welcome to nginx!

-

If you see this page, the container with the nginx web server is -successfully installed and working.

- - diff --git a/rmt-nginx/rmt-nginx.changes b/rmt-nginx/rmt-nginx.changes deleted file mode 100644 index 296f1db1f..000000000 --- a/rmt-nginx/rmt-nginx.changes +++ /dev/null @@ -1,64 +0,0 @@ -------------------------------------------------------------------- -Wed Nov 23 10:08:28 UTC 2022 - Dan Čermák - -- Update 20-envsubst-on-templates.sh and docker-entrypoint.sh from upstream - -------------------------------------------------------------------- -Mon Sep 26 14:51:57 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Mon Sep 26 07:53:05 UTC 2022 - Dan Čermák - -- Improve logging in nginx scripts - -------------------------------------------------------------------- -Fri Aug 19 10:24:42 UTC 2022 - Dan Čermák - -- Use obs-service-replace_using_package_version for the container version - -------------------------------------------------------------------- -Fri Jun 17 09:18:26 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Tue May 3 09:27:47 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:35 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:07:26 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:45:03 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:12:15 UTC 2022 - Dan Čermák - -- Fix quotes in CMD and ENTRYPOINT - -------------------------------------------------------------------- -Tue Mar 8 07:29:11 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:36:46 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 10:29:48 UTC 2022 - Dan Čermák - -- Add SPDX license identifier & correct labelprefix diff --git a/rmt-server/Dockerfile b/rmt-server/Dockerfile deleted file mode 100644 index bf9c90f28..000000000 --- a/rmt-server/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: MIT -#!BuildTag: suse/rmt-server:%%rmt_version%% -#!BuildTag: suse/rmt-server:%%rmt_version%%-%RELEASE% - -FROM suse/sle15:15.3 - -MAINTAINER SUSE LLC (https://www.suse.com/) - -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.rmt-server -LABEL org.opencontainers.image.title="SLE RMT Server Container Image" -LABEL org.opencontainers.image.description="SUSE RMT Server based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%rmt_version%%" -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.opensuse.reference="registry.suse.com/suse/rmt-server:%%rmt_version%%-%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" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -RUN set -euo pipefail; zypper -n in --no-recommends rmt-server catatonit; zypper -n clean; rm -rf /var/log/* -ENV RAILS_ENV="production" -ENV LANG="en" - -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -CMD ["/usr/share/rmt/bin/rails", "server", "-e", "production"] -COPY entrypoint.sh /usr/local/bin/entrypoint.sh -RUN set -euo pipefail; chmod +x /usr/local/bin/entrypoint.sh diff --git a/rmt-server/_service b/rmt-server/_service deleted file mode 100644 index c9c6ac7aa..000000000 --- a/rmt-server/_service +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Dockerfile - %%rmt_version%% - rmt-server - minor - - \ No newline at end of file diff --git a/rmt-server/entrypoint.sh b/rmt-server/entrypoint.sh deleted file mode 100644 index bc24a2f21..000000000 --- a/rmt-server/entrypoint.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -set -e - -# PV could be empty, make sure the directories exist -mkdir -p /var/lib/rmt/public/repo -mkdir -p /var/lib/rmt/public/suma -mkdir -p /var/lib/rmt/regsharing -mkdir -p /var/lib/rmt/tmp -# Set permissions -chown -R _rmt:nginx /var/lib/rmt - -if [ -z "${MYSQL_HOST}" ]; then - echo "MYSQL_HOST not set!" - exit 1 -fi -if [ -z "${MYSQL_PASSWORD}" ]; then - echo "MYSQL_PASSWORD not set!" - exit 1 -fi - -MYSQL_DATABASE="${MYSQL_DATABASE:-rmt}" -MYSQL_USER="${MYSQL_USER:-rmt}" - -# Create adjusted /etc/rmt.conf -echo -e "database:\n host: ${MYSQL_HOST}\n database: ${MYSQL_DATABASE}\n username: ${MYSQL_USER}\n password: ${MYSQL_PASSWORD}" > /etc/rmt.conf -echo -e " adapter: mysql2\n encoding: utf8\n timeout: 5000\n pool: 5\n" >> /etc/rmt.conf -echo -e "scc:\n username: ${SCC_USERNAME}\n password: ${SCC_PASSWORD}\n sync_systems: true\n" >> /etc/rmt.conf -echo -e "log_level:\n rails: debug" >> /etc/rmt.conf - -if [ $# -eq 0 ]; then - set -- /usr/share/rmt/bin/rails server -e production -fi - -if [ "$1" == "/usr/share/rmt/bin/rails" -a "$2" == "server" ]; then - echo "Create/migrate RMT database" - pushd /usr/share/rmt > /dev/null - /usr/share/rmt/bin/rails db:create db:migrate RAILS_ENV=production - popd > /dev/null - echo "Syncing product list" - rmt-cli sync - for PRODUCT in $SCC_PRODUCT_ENABLE - do - rmt-cli products enable $PRODUCT - done - for PRODUCT in $SCC_PRODUCT_DISABLE - do - rmt-cli products disable $PRODUCT - done - rmt-cli repos clean - echo "Executing: catatonit -- $@" - exec catatonit -- "$@" -else - echo "Executing: $@" - exec "$@" -fi diff --git a/rmt-server/rmt-server.changes b/rmt-server/rmt-server.changes deleted file mode 100644 index fb874b258..000000000 --- a/rmt-server/rmt-server.changes +++ /dev/null @@ -1,73 +0,0 @@ -------------------------------------------------------------------- -Mon Sep 26 14:52:11 UTC 2022 - Dan Čermák - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Aug 19 10:24:58 UTC 2022 - Dan Čermák - -- Use obs-service-replace_using_package_version for the container version - -------------------------------------------------------------------- -Fri Jun 17 09:18:46 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Mon May 23 13:38:02 UTC 2022 - Bruno Leon - -- Update rmt-server to 2.8 - -------------------------------------------------------------------- -Tue May 3 09:28:02 UTC 2022 - Dan Čermák - -- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures - -------------------------------------------------------------------- -Thu Apr 28 11:42:03 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent - -------------------------------------------------------------------- -Fri Apr 22 08:12:53 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:07:42 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:45:11 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:12:26 UTC 2022 - Dan Čermák - -- Fix quotes in CMD and ENTRYPOINT - -------------------------------------------------------------------- -Tue Mar 8 07:29:19 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:28:36 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel - -------------------------------------------------------------------- -Wed Feb 16 14:07:07 UTC 2022 - Dan Čermák - -- Add SPDX license identifier & correct build tags - -------------------------------------------------------------------- -Tue Feb 15 10:31:25 UTC 2022 - Bruno Leon - -- Ensure entrypoint as executable bit set -- Fix labelprefix -- Initial version using Dockerfile instead of kiwi -- diff --git a/ruby-2.5-image/_service b/ruby-2.5-image/_service deleted file mode 100644 index 74fdc5325..000000000 --- a/ruby-2.5-image/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ruby-2.5-image.kiwi - %%rb_ver%% - ruby2.5 - - - ruby-2.5-image.kiwi - %%rb_maj%% - ruby2.5 - minor - - \ No newline at end of file diff --git a/ruby-2.5-image/config.sh b/ruby-2.5-image/config.sh deleted file mode 100644 index a0adde519..000000000 --- a/ruby-2.5-image/config.sh +++ /dev/null @@ -1,30 +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 - -sed -i 's/--format-executable/--no-format-executable/' /etc/gemrc - -#======================================= -# 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/ruby-2.5-image/ruby-2.5-image.changes b/ruby-2.5-image/ruby-2.5-image.changes deleted file mode 100644 index dd61a163a..000000000 --- a/ruby-2.5-image/ruby-2.5-image.changes +++ /dev/null @@ -1,93 +0,0 @@ -------------------------------------------------------------------- -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 - -- Apply buildrecipe templates - -------------------------------------------------------------------- -Fri Jun 17 09:19:14 UTC 2022 - Dan Čermák - -- Switch latest tag to 15SP4 - -------------------------------------------------------------------- -Thu Apr 28 11:42:34 UTC 2022 - Dan Čermák - -- Ensure that /var/log/zypp is absent -- Add util-linux package to prevent dependency resolution errors - -------------------------------------------------------------------- -Wed Apr 27 07:34:55 UTC 2022 - Dan Čermák - -- shorten license header in config.sh; remove nop suseSetupProduct - -------------------------------------------------------------------- -Fri Apr 22 08:13:29 UTC 2022 - Dan Čermák - -- remove org.opencontainers.image.revision label - -------------------------------------------------------------------- -Wed Apr 20 14:08:11 UTC 2022 - Dan Čermák - -- Ensure that the reference contains the %RELEASE% - -------------------------------------------------------------------- -Tue Apr 12 08:45:43 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:29:52 UTC 2022 - Dan Čermák - -- Shorten description (jsc#BCI-42) - -------------------------------------------------------------------- -Fri Feb 25 14:29:03 UTC 2022 - Dan Čermák - -- Switch from the techpreview label to supportlevel -- Add additional tag '2' - -------------------------------------------------------------------- -Tue Feb 15 09:42:42 UTC 2022 - Dan Čermák - -- Add SPDX license identifier - -------------------------------------------------------------------- -Thu Feb 10 15:06:28 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Tue Feb 8 16:21:22 UTC 2022 - Dan Čermák - -- Recreate build recipes from the build templates - -------------------------------------------------------------------- -Mon Feb 7 14:22:34 UTC 2022 - Dan Čermák - -- Adjust labels according to jsc#BCI-33 - -------------------------------------------------------------------- -Tue Jan 4 08:36:39 UTC 2022 - Dan Čermák - -- Fix description - -------------------------------------------------------------------- -Wed Dec 15 10:19:19 UTC 2021 - Dan Čermák - -- Add timezone package for Rails support - -------------------------------------------------------------------- -Fri Nov 12 08:22:38 UTC 2021 - Dan Čermák - -- Add additional development dependencies so that gems can be installed -- modify /etc/gemrc so that gem binaries get installed as `bin` and not with the - ruby2.5 suffix - -------------------------------------------------------------------- -Tue Oct 26 15:27:25 UTC 2021 - Dan Čermák - -- Initial version of the BCI ruby 2.5 container diff --git a/ruby-2.5-image/ruby-2.5-image.kiwi b/ruby-2.5-image/ruby-2.5-image.kiwi deleted file mode 100644 index d1503b1ae..000000000 --- a/ruby-2.5-image/ruby-2.5-image.kiwi +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - SUSE LLC - https://www.suse.com/ - SLE BCI Ruby 2.5 Container Image - - - - - - - - - - - - - - - - - - 15.3.0 - zypper - false - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file