From 896b40764a467c36c197cb743698829e02152b3f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 13 Oct 2022 07:33:42 +0200 Subject: [PATCH] [bitnami/discourse] Release 2.8.9-debian-11-r6 (#10046) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/discourse/2/debian-11/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- .../2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bitnami/discourse/2/debian-11/Dockerfile b/bitnami/discourse/2/debian-11/Dockerfile index 6e785086919c..d18461ecfe34 100644 --- a/bitnami/discourse/2/debian-11/Dockerfile +++ b/bitnami/discourse/2/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="2.8.9-debian-11-r5" \ + org.opencontainers.image.ref.name="2.8.9-debian-11-r6" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/discourse" \ org.opencontainers.image.title="discourse" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -21,7 +21,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.14-2-linux-${OS_ARCH}-debian-11" \ + "python-3.8.15-0-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.3-155-linux-${OS_ARCH}-debian-11" \ "ruby-2.7.6-154-linux-${OS_ARCH}-debian-11" \ "postgresql-client-14.5.0-2-linux-${OS_ARCH}-debian-11" \ @@ -37,7 +37,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 autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5dd6f6f4c7b0..c66127215e7d 100644 --- a/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -36,10 +36,10 @@ }, "python": { "arch": "amd64", - "digest": "82f68137917ed04f98cf39ef3ec2cc95f05f93f1456ca9709ba9d98c5a0bed1b", + "digest": "88e943f67e0ca48fc1395ed0f15f2a91bec1e2fedc3b417b6e04fca797fae225", "distro": "debian-11", "type": "NAMI", - "version": "3.8.14-2" + "version": "3.8.15-0" }, "ruby": { "arch": "amd64", diff --git a/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/discourse/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/discourse/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]+$//' } ########################