From af2d0caa53108c4dd4711154e1599b3bbef42203 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 13 Oct 2022 08:30:56 +0200 Subject: [PATCH] [bitnami/spring-cloud-dataflow] Release 2.9.6-debian-11-r10 (#9816) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile | 2 +- .../2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile index 3c25ab28664e..4956c21af107 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/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="2.9.6-debian-11-r9" \ + org.opencontainers.image.ref.name="2.9.6-debian-11-r10" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow" \ org.opencontainers.image.title="spring-cloud-dataflow" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/spring-cloud-dataflow/2/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]+$//' } ########################