From 687bb03df7682e8a954f52aab6e25dc50ebae42a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 13 Oct 2022 08:56:28 +0200 Subject: [PATCH] [bitnami/drupal-nginx] Release 7.92.0-debian-11-r13 (#10056) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/drupal-nginx/7/debian-11/Dockerfile | 4 ++-- .../7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/drupal-nginx/7/debian-11/Dockerfile b/bitnami/drupal-nginx/7/debian-11/Dockerfile index 5ca4b9a6654b..7cf64c80caad 100644 --- a/bitnami/drupal-nginx/7/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/7/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="7.92.0-debian-11-r12" \ + org.opencontainers.image.ref.name="7.92.0-debian-11-r13" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal-nginx" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -35,7 +35,7 @@ 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 update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/drupal-nginx/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal-nginx/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/drupal-nginx/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/drupal-nginx/7/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]+$//' } ########################