From e16f609986d82cf5bba9318e8dd51738e7750769 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 10 Dec 2024 13:42:54 +0000 Subject: [PATCH] Test build for #2134 --- helm-image/Dockerfile | 4 ++-- helm-image/README.md | 2 +- rmt-mariadb-image/Dockerfile | 7 +++++-- rmt-mariadb-image/{gosu => idexec} | 0 4 files changed, 8 insertions(+), 5 deletions(-) rename rmt-mariadb-image/{gosu => idexec} (100%) diff --git a/helm-image/Dockerfile b/helm-image/Dockerfile index 035bd25cb..04306a6a6 100644 --- a/helm-image/Dockerfile +++ b/helm-image/Dockerfile @@ -40,8 +40,8 @@ COPY --from=builder /target / # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.application.helm LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions" -LABEL org.opencontainers.image.title="SLE Kubernetes Package Manager" -LABEL org.opencontainers.image.description="Kubernetes Package Manager container based on the SLE Base Container Image." +LABEL org.opencontainers.image.title="SLE Helm (Kubernetes Package Manager)" +LABEL org.opencontainers.image.description="Helm (Kubernetes Package Manager) container based on the SLE Base Container Image." LABEL org.opencontainers.image.version="%%helm_version%%" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" diff --git a/helm-image/README.md b/helm-image/README.md index d9998ac7e..7ea3d2a9f 100644 --- a/helm-image/README.md +++ b/helm-image/README.md @@ -1,4 +1,4 @@ -# Kubernetes Package Manager container image +# Helm (Kubernetes Package Manager) container image [![SLSA](https://img.shields.io/badge/SLSA_(v1.0)-Build_L3-Green)](https://documentation.suse.com/sbp/server-linux/html/SBP-SLSA4/) [![Provenance: Available](https://img.shields.io/badge/Provenance-Available-Green)](https://documentation.suse.com/container/all/html/Container-guide/index.html#container-verify) diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile index 73245b204..9577a5ce9 100644 --- a/rmt-mariadb-image/Dockerfile +++ b/rmt-mariadb-image/Dockerfile @@ -75,8 +75,11 @@ RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards co COPY healthcheck.sh /usr/local/bin/ RUN set -euo pipefail; chmod 755 /usr/local/bin/healthcheck.sh -COPY gosu /usr/local/bin/gosu -RUN set -euo pipefail; chmod 755 /usr/local/bin/gosu +COPY idexec /usr/local/bin/idexec +RUN set -euo pipefail; chmod 755 /usr/local/bin/idexec + +# replace gosu calls with idexec +RUN set -euo pipefail; sed -i 's/gosu/idexec/g' /usr/local/bin/docker-entrypoint.sh RUN set -euo pipefail; sed -i -e 's,$(pwgen .*),$(openssl rand -base64 36),' /usr/local/bin/docker-entrypoint.sh diff --git a/rmt-mariadb-image/gosu b/rmt-mariadb-image/idexec similarity index 100% rename from rmt-mariadb-image/gosu rename to rmt-mariadb-image/idexec