From 52f85727a5b349a3094855ce619d2dea76b5e98e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 2 Sep 2022 06:30:22 +0200
Subject: [PATCH] [bitnami/percona-mysql] Release 8.0.29-21-debian-11-r7
 (#4957)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 .../percona-mysql/8.0/debian-11/Dockerfile    | 42 ++++++++++--
 .../opt/bitnami/scripts/libcomponent.sh       | 65 -------------------
 bitnami/percona-mysql/README.md               |  2 +-
 3 files changed, 37 insertions(+), 72 deletions(-)
 delete mode 100644 bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh

diff --git a/bitnami/percona-mysql/8.0/debian-11/Dockerfile b/bitnami/percona-mysql/8.0/debian-11/Dockerfile
index 2eeaa67e6a99..9528c4b39430 100644
--- a/bitnami/percona-mysql/8.0/debian-11/Dockerfile
+++ b/bitnami/percona-mysql/8.0/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="8.0.29-21-debian-11-r6" \
+      org.opencontainers.image.ref.name="8.0.29-21-debian-11-r7" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/percona-mysql" \
       org.opencontainers.image.title="percona-mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -16,11 +16,41 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libaio1 libaudit1 libbrotli1 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libnuma-dev libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libudev1 libunistring2 libuuid1 procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "percona-xtrabackup-binary" "8.0.29-22-1" --checksum 9512f78d6fa57a0d7e4e8c8d9ba0821189834e2101271875e2088e1b564b010e
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.3-153" --checksum 4692a063a41c8382fbf1629f92bb91cc3064d50b25bddeb7e1b299c749e39afd
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "percona-mysql" "8.0.29-21-1" --checksum 5b88dcb9abe9f76954621e06c4234aa8897cb7e3caadb8f2626a0083fcd3d982
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-shell" "8.0.30-1" --checksum fa38683773c36e05b36e5bf4b391b4b4f287fc1457512289ead7c07755f29012
-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 percona-xtrabackup-binary-8.0.29-22-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-xtrabackup-binary-8.0.29-22-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "9512f78d6fa57a0d7e4e8c8d9ba0821189834e2101271875e2088e1b564b010e  percona-xtrabackup-binary-8.0.29-22-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf percona-xtrabackup-binary-8.0.29-22-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf percona-xtrabackup-binary-8.0.29-22-1-linux-amd64-debian-11.tar.gz
+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 percona-mysql-8.0.29-21-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-mysql-8.0.29-21-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "5b88dcb9abe9f76954621e06c4234aa8897cb7e3caadb8f2626a0083fcd3d982  percona-mysql-8.0.29-21-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf percona-mysql-8.0.29-21-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf percona-mysql-8.0.29-21-1-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f mysql-shell-8.0.30-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-shell-8.0.30-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "fa38683773c36e05b36e5bf4b391b4b4f287fc1457512289ead7c07755f29012  mysql-shell-8.0.30-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf mysql-shell-8.0.30-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf mysql-shell-8.0.30-1-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/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/percona-mysql/8.0/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/percona-mysql/README.md b/bitnami/percona-mysql/README.md
index 5b3d0d7a3b91..6ffa026bf6e9 100644
--- a/bitnami/percona-mysql/README.md
+++ b/bitnami/percona-mysql/README.md
@@ -28,7 +28,7 @@ $ docker run --name percona-mysql bitnami/percona-mysql:latest
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`8.0`, `8.0-debian-11`, `8.0.29-21`, `8.0.29-21-debian-11-r6`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/8.0/debian-11/Dockerfile)
+* [`8.0`, `8.0-debian-11`, `8.0.29-21`, `8.0.29-21-debian-11-r7`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/8.0/debian-11/Dockerfile)
 * [`5.7`, `5.7-debian-11`, `5.7.39-42`, `5.7.39-42-debian-11-r4` (5.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/5.7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).