From 6c1146bcab54c3707aa6c6b02f6ecbd0fcfc4704 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 1 Sep 2022 07:36:34 +0200 Subject: [PATCH] [bitnami/mariadb-galera] Release 10.7.5-debian-11-r4 (#4712) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../mariadb-galera/10.7/debian-11/Dockerfile | 26 ++++++-- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- bitnami/mariadb-galera/README.md | 2 +- 3 files changed, 23 insertions(+), 70 deletions(-) delete mode 100644 bitnami/mariadb-galera/10.7/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/mariadb-galera/10.7/debian-11/Dockerfile b/bitnami/mariadb-galera/10.7/debian-11/Dockerfile index 3f1fe0809135..0edda6d97dc9 100644 --- a/bitnami/mariadb-galera/10.7/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.7/debian-11/Dockerfile @@ -6,7 +6,7 @@ ENV HOME="/" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="10.7.5-debian-11-r3" \ + org.opencontainers.image.ref.name="10.7.5-debian-11-r4" \ 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." \ @@ -16,9 +16,27 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip iproute2 ldap-utils libaio1 libaudit1 libc6 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libnss-ldapd libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.3-153" --checksum 4692a063a41c8382fbf1629f92bb91cc3064d50b25bddeb7e1b299c749e39afd -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mariadb-galera" "10.7.5-2" --checksum 1f5d8d6ee0123eba6478fbe9996cb63cbc5d416a4712ab25ee26509774ac8f08 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f ini-file-1.4.3-153-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "4692a063a41c8382fbf1629f92bb91cc3064d50b25bddeb7e1b299c749e39afd ini-file-1.4.3-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf ini-file-1.4.3-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf ini-file-1.4.3-153-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f mariadb-galera-10.7.5-2-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mariadb-galera-10.7.5-2-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "1f5d8d6ee0123eba6478fbe9996cb63cbc5d416a4712ab25ee26509774ac8f08 mariadb-galera-10.7.5-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf mariadb-galera-10.7.5-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf mariadb-galera-10.7.5-2-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/mariadb-galera/10.7/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/mariadb-galera/10.7/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/mariadb-galera/10.7/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 4110274c5919..18b52cd80121 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.8`, `10.8-debian-11`, `10.8.4`, `10.8.4-debian-11-r3`, `latest` (10.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.8/debian-11/Dockerfile) -* [`10.7`, `10.7-debian-11`, `10.7.5`, `10.7.5-debian-11-r3` (10.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.7/debian-11/Dockerfile) +* [`10.7`, `10.7-debian-11`, `10.7.5`, `10.7.5-debian-11-r4` (10.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.7/debian-11/Dockerfile) * [`10.6`, `10.6-debian-11`, `10.6.9`, `10.6.9-debian-11-r5` (10.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.6/debian-11/Dockerfile) * [`10.5`, `10.5-debian-11`, `10.5.17`, `10.5.17-debian-11-r3` (10.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.5/debian-11/Dockerfile) * [`10.4`, `10.4-debian-11`, `10.4.26`, `10.4.26-debian-11-r4` (10.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.4/debian-11/Dockerfile)