From 2d49ed94d7aaf5349ae34de798e1817ba3b00b05 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 20 Sep 2022 17:37:39 +0200
Subject: [PATCH] [bitnami/mysql] Release 8.0.30-debian-11-r20 (#7171)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mysql/8.0/debian-11/Dockerfile                   | 4 ++--
 .../debian-11/prebuildfs/opt/bitnami/scripts/libos.sh    | 8 ++++++++
 .../8.0/debian-11/prebuildfs/usr/sbin/install_packages   | 9 +++++----
 bitnami/mysql/README.md                                  | 2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/bitnami/mysql/8.0/debian-11/Dockerfile b/bitnami/mysql/8.0/debian-11/Dockerfile
index 17a228c58b66..c7d01136ed6e 100644
--- a/bitnami/mysql/8.0/debian-11/Dockerfile
+++ b/bitnami/mysql/8.0/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="8.0.30-debian-11-r19" \
+      org.opencontainers.image.ref.name="8.0.30-debian-11-r20" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mysql" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -44,7 +44,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     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 && \
-    rm -r /var/lib/apt/lists /var/cache/apt/archives
+    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/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 08b1d4884c28..e25f3b5d9594 100644
--- a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -197,6 +197,8 @@ am_i_root() {
 #   --version - Distro version
 #   --branch - Distro branch
 #   --codename - Distro codename
+#   --name - Distro name
+#   --pretty-name - Distro pretty name
 # Returns:
 #   String
 #########################
@@ -223,6 +225,12 @@ get_os_metadata() {
     --codename)
         get_os_release_metadata VERSION_CODENAME
         ;;
+    --name)
+        get_os_release_metadata NAME
+        ;;
+    --pretty-name)
+        get_os_release_metadata PRETTY_NAME
+        ;;
     *)
         error "Unknown flag ${flag_name}"
         return 1
diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/install_packages
index c9577647443b..77857a1a57f2 100755
--- a/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/install_packages
@@ -1,9 +1,10 @@
 #!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
+set -eu
+
 n=0
 max=2
+export DEBIAN_FRONTEND=noninteractive
+
 until [ $n -gt $max ]; do
     set +e
     (
@@ -21,4 +22,4 @@ until [ $n -gt $max ]; do
     echo "apt failed, retrying"
     n=$(($n + 1))
 done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md
index 7be5b56fd447..11d0a8df341c 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -47,7 +47,7 @@ Non-root container images add an extra layer of security and are generally recom
 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.30`, `8.0.30-debian-11-r19`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mysql/8.0/debian-11/Dockerfile)
+* [`8.0`, `8.0-debian-11`, `8.0.30`, `8.0.30-debian-11-r20`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mysql/8.0/debian-11/Dockerfile)
 * [`5.7`, `5.7-debian-11`, `5.7.39`, `5.7.39-debian-11-r20` (5.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mysql/5.7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).