From 309d113b4185efec4c996d97a30bab0d3c04823f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 13 Oct 2022 02:03:16 +0200 Subject: [PATCH] [bitnami/java] Release 17.0.4-8-debian-11-r23 (#9899) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/java/17/debian-11/Dockerfile | 7 +++---- .../17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bitnami/java/17/debian-11/Dockerfile b/bitnami/java/17/debian-11/Dockerfile index c7241ddc974a..9539b3cb3b78 100644 --- a/bitnami/java/17/debian-11/Dockerfile +++ b/bitnami/java/17/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="17.0.4-8-debian-11-r22" \ + org.opencontainers.image.ref.name="17.0.4-8-debian-11-r23" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/java" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -31,10 +31,9 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ fi && \ sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ +RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -519,7 +519,7 @@ get_machine_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)" + device_id="$(grep ^/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 @@ -538,7 +538,7 @@ get_disk_device_id() { # Root disk ID ######################### get_root_disk_device_id() { - get_disk_device_id | sed 's/[0-9]\+$//' + get_disk_device_id | sed -E 's/p?[0-9]+$//' } ########################