From 8c3a6961ee4acef24297b1e87d6d5096fe106210 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 22 Sep 2022 16:03:18 +0200 Subject: [PATCH] [bitnami/postgresql-repmgr] Release 12.12.0-debian-11-r18 (#7366) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../postgresql-repmgr/12/debian-11/Dockerfile | 6 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 55 +++++++++++++++++++ .../prebuildfs/usr/sbin/install_packages | 9 +-- bitnami/postgresql-repmgr/README.md | 2 +- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile b/bitnami/postgresql-repmgr/12/debian-11/Dockerfile index cbb8a91634c4..e07447ca5db9 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/12/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="12.12.0-debian-11-r17" \ + org.opencontainers.image.ref.name="12.12.0-debian-11-r18" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -18,7 +18,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gzip libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps tar zlib1g +RUN install_packages ca-certificates curl gzip libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps tar zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f postgresql-repmgr-12.12.0-9-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/postgresql-repmgr-12.12.0-9-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -36,7 +36,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 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/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/postgresql-repmgr/12/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 +} diff --git a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/postgresql-repmgr/12/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 diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index d2e47ed99847..17cea92e18a3 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`14`, `14-debian-11`, `14.5.0`, `14.5.0-debian-11-r15`, `latest` (14/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/14/debian-11/Dockerfile) * [`13`, `13-debian-11`, `13.8.0`, `13.8.0-debian-11-r17` (13/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/13/debian-11/Dockerfile) -* [`12`, `12-debian-11`, `12.12.0`, `12.12.0-debian-11-r17` (12/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/12/debian-11/Dockerfile) +* [`12`, `12-debian-11`, `12.12.0`, `12.12.0-debian-11-r18` (12/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/12/debian-11/Dockerfile) * [`11`, `11-debian-11`, `11.17.0`, `11.17.0-debian-11-r17` (11/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/11/debian-11/Dockerfile) * [`10`, `10-debian-11`, `10.22.0`, `10.22.0-debian-11-r17` (10/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/10/debian-11/Dockerfile)