From bf8d25ef3e3cf946f3e6206cbacaa759181c58ee Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 5 Oct 2022 21:22:47 +0200 Subject: [PATCH] [bitnami/mariadb-galera] Release 10.7.6-debian-11-r5 (#9035) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../mariadb-galera/10.7/debian-11/Dockerfile | 41 ++++++++----------- .../opt/bitnami/scripts/libldapclient.sh | 28 +++++++------ bitnami/mariadb-galera/README.md | 2 +- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/bitnami/mariadb-galera/10.7/debian-11/Dockerfile b/bitnami/mariadb-galera/10.7/debian-11/Dockerfile index d94e7616c393..2e57ec31d1c4 100644 --- a/bitnami/mariadb-galera/10.7/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.7/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="10.7.6-debian-11-r4" \ + org.opencontainers.image.ref.name="10.7.6-debian-11-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -20,30 +20,21 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN apt-get update && apt-get upgrade -y && \ + for COMPONENT in \ + "ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.7.6-0-linux-${OS_ARCH}-debian-11" \ + "gosu-1.14.0-154-linux-${OS_ARCH}-debian-11" ; \ + do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256 -O ; \ + fi && \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami RUN mkdir /docker-entrypoint-initdb.d diff --git a/bitnami/mariadb-galera/10.7/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh b/bitnami/mariadb-galera/10.7/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh index a837c230a70c..7d3cb3202f3b 100644 --- a/bitnami/mariadb-galera/10.7/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh +++ b/bitnami/mariadb-galera/10.7/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh @@ -56,9 +56,9 @@ EOF ldap_openldap_config_path() { local openldap_config case "$OS_FLAVOUR" in - debian-*|ubuntu-*) openldap_config=/etc/ldap/ldap.conf ;; - centos-*|photon-*) openldap_config=/etc/openldap/ldap.conf ;; - *) error "Unsupported OS flavor ${OS_FLAVOUR}" && exit 1 ;; + debian-* | ubuntu-*) openldap_config=/etc/ldap/ldap.conf ;; + centos-* | photon-* | redhatubi-*) openldap_config=/etc/openldap/ldap.conf ;; + *) error "Unsupported OS flavor ${OS_FLAVOUR}" && exit 1 ;; esac echo "$openldap_config" } @@ -74,6 +74,8 @@ ldap_openldap_config_path() { ######################### ldap_configure_permissions() { ensure_dir_exists "/var/run/nslcd" && configure_permissions_ownership "/var/run/nslcd" -u "root" -g "root" -d "775" + # The nslcd.conf file may not exist in distros like UBI, so we need to create it first + touch "/etc/nslcd.conf" configure_permissions_ownership "/etc/nslcd.conf" -u "root" -g "root" -f "660" configure_permissions_ownership "$(ldap_openldap_config_path)" -u "root" -g "root" -f "660" } @@ -91,19 +93,19 @@ ldap_create_nslcd_config() { if am_i_root; then chown "root:${LDAP_NSLCD_GROUP}" "/etc/nslcd.conf" chown -R "${LDAP_NSLCD_USER}:${LDAP_NSLCD_GROUP}" "/var/run/nslcd" - cat > "/etc/nslcd.conf" <"/etc/nslcd.conf" < "/etc/nslcd.conf" <"/etc/nslcd.conf" <> "/etc/nslcd.conf" <>"/etc/nslcd.conf" <>"/etc/nslcd.conf"<>"/etc/nslcd.conf" <>"/etc/nslcd.conf"<>"/etc/nslcd.conf" <>"/etc/nslcd.conf"<>"/etc/nslcd.conf" <>"/etc/nslcd.conf"<>"/etc/nslcd.conf" <>"/etc/nslcd.conf"<>"/etc/nslcd.conf" <>"$(ldap_openldap_config_path)"<>"$(ldap_openldap_config_path)" < "/etc/pam.d/${filename}" << EOF + cat >"/etc/pam.d/${filename}" <