[bitnami/ksql] Release 6.1.7-debian-11-r16 (#7215)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2022-09-20 23:37:51 +02:00 · 2022-09-20 23:37:51 +02:00 · 3572d6202b
parent aa597f7fb5
commit 3572d6202b
5 changed files with 72 additions and 16 deletions
--- a/bitnami/ksql/6.1/debian-11/Dockerfile
+++ b/bitnami/ksql/6.1/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.1.7-debian-11-r15" \
+      org.opencontainers.image.ref.name="6.1.7-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,15 +19,15 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages acl ca-certificates curl gzip libc6 netcat-traditional procps tar zlib1g
+RUN install_packages acl ca-certificates curl gzip netcat-traditional procps tar zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    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 ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
    fi && \
-    sha256sum -c java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz java-11.0.15-1-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
    if [ ! -f ksql-6.1.7-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
      curl -SsLf https://downloads.bitnami.com/files/stacksmith/ksql-6.1.7-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
@ -45,7 +45,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

 COPY rootfs /
--- a/bitnami/ksql/6.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ksql/6.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@ -8,10 +8,10 @@
    },
    "java": {
        "arch": "amd64",
-        "digest": "7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7",
+        "digest": "98cbaca6fc1aca76fdbfc11ee57d05924adc956401396375c4be43c5c671dca5",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "11.0.15-1-3"
+        "version": "11.0.16-0"
    },
    "ksql": {
        "arch": "amd64",
--- a/bitnami/ksql/6.1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/ksql/6.1/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
@ -498,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
+}
--- a/bitnami/ksql/6.1/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/ksql/6.1/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
--- a/bitnami/ksql/README.md
+++ b/bitnami/ksql/README.md
@ -32,7 +32,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`7.1`, `7.1-debian-11`, `7.1.3`, `7.1.3-debian-11-r15` (7.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/7.1/debian-11/Dockerfile)
 * [`7.0`, `7.0-debian-11`, `7.0.5`, `7.0.5-debian-11-r15` (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.7`, `6.1.7-debian-11-r15` (6.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/ksql/6.1/debian-11/Dockerfile)
+* [`6.1`, `6.1-debian-11`, `6.1.7`, `6.1.7-debian-11-r16` (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)

 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).