From 8622f78a5087ed4ca1b41c47490e6c761115581b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 23 Sep 2022 17:57:01 +0200
Subject: [PATCH] [bitnami/ksql] Release 6.0.9-debian-11-r16 (#7670)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/ksql/6.0/debian-11/Dockerfile         |  4 +-
 .../prebuildfs/opt/bitnami/scripts/libos.sh   | 47 +++++++++++++++++++
 bitnami/ksql/README.md                        |  2 +-
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/bitnami/ksql/6.0/debian-11/Dockerfile b/bitnami/ksql/6.0/debian-11/Dockerfile
index 484dc1bcd118..80ca00d0516a 100644
--- a/bitnami/ksql/6.0/debian-11/Dockerfile
+++ b/bitnami/ksql/6.0/debian-11/Dockerfile
@@ -5,7 +5,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="6.0.9-debian-11-r15" \
+      org.opencontainers.image.ref.name="6.0.9-debian-11-r16" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/ksql" \
       org.opencontainers.image.title="ksql" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -19,7 +19,7 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages acl ca-certificates curl gzip netcat-traditional procps tar zlib1g
+RUN install_packages ca-certificates curl netcat-traditional procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     if [ ! -f java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
       curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
diff --git a/bitnami/ksql/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/ksql/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index e25f3b5d9594..92530b32d94d 100644
--- a/bitnami/ksql/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/ksql/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -506,3 +506,50 @@ get_machine_id() {
     fi
     echo "$machine_id"
 }
+
+########################
+# Get the root partition's disk device ID (e.g. /dev/sda1)
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root partition disk ID
+#########################
+get_disk_device_id() {
+    local device_id=""
+    if grep -q ^/dev /proc/mounts; then
+        device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
+    fi
+    # If it could not be autodetected, fallback to /dev/sda1 as a default
+    if [[ -z "$device_id" || ! -b "$device_id" ]]; then
+        device_id="/dev/sda1"
+    fi
+    echo "$device_id"
+}
+
+########################
+# Get the root disk device ID (e.g. /dev/sda)
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root disk ID
+#########################
+get_root_disk_device_id() {
+    get_disk_device_id | sed 's/[0-9]\+$//'
+}
+
+########################
+# Get the root disk size in bytes
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root disk size in bytes
+#########################
+get_root_disk_size() {
+    fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
+}
diff --git a/bitnami/ksql/README.md b/bitnami/ksql/README.md
index 711a8cfa5603..97fd6f44b0ac 100644
--- a/bitnami/ksql/README.md
+++ b/bitnami/ksql/README.md
@@ -33,7 +33,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`7.0`, `7.0-debian-11`, `7.0.6`, `7.0.6-debian-11-r-1` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/7.0/debian-11/Dockerfile)
 * [`6.2`, `6.2-debian-11`, `6.2.6`, `6.2.6-debian-11-r15` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/6.2/debian-11/Dockerfile)
 * [`6.1`, `6.1-debian-11`, `6.1.8`, `6.1.8-debian-11-r0` (6.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/6.1/debian-11/Dockerfile)
-* [`6.0`, `6.0-debian-11`, `6.0.9`, `6.0.9-debian-11-r15` (6.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/6.0/debian-11/Dockerfile)
+* [`6.0`, `6.0-debian-11`, `6.0.9`, `6.0.9-debian-11-r16` (6.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/6.0/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).