From 6cb007f3d54b1b5564cd2fdb26e1075d96f92a04 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 2 Sep 2022 06:27:50 +0200 Subject: [PATCH] [bitnami/postgresql] Release 13.8.0-debian-11-r9 (#4955) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/postgresql/13/debian-11/Dockerfile | 18 ++++- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- bitnami/postgresql/README.md | 2 +- 3 files changed, 16 insertions(+), 69 deletions(-) delete mode 100644 bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/postgresql/13/debian-11/Dockerfile b/bitnami/postgresql/13/debian-11/Dockerfile index 950bd23b2d16..5feb7a6b1168 100644 --- a/bitnami/postgresql/13/debian-11/Dockerfile +++ b/bitnami/postgresql/13/debian-11/Dockerfile @@ -8,7 +8,7 @@ ARG EXTRA_LOCALES="" ARG WITH_ALL_LOCALES="no" LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="13.8.0-debian-11-r8" \ + org.opencontainers.image.ref.name="13.8.0-debian-11-r9" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/postgresql" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -18,8 +18,20 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbsd0 libbz2-1.0 libc6 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "13.8.0-6" --checksum 33c9ed6df5b1e8013208251ad2574d4a66fbbbb68fd169be61acf59e4af4885b +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f postgresql-13.8.0-6-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/postgresql-13.8.0-6-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "33c9ed6df5b1e8013208251ad2574d4a66fbbbb68fd169be61acf59e4af4885b postgresql-13.8.0-6-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf postgresql-13.8.0-6-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf postgresql-13.8.0-6-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 7e5fbd69fc2f..259e7f1b4d39 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -48,7 +48,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-r8`, `latest` (14/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/14/debian-11/Dockerfile) -* [`13`, `13-debian-11`, `13.8.0`, `13.8.0-debian-11-r8` (13/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/13/debian-11/Dockerfile) +* [`13`, `13-debian-11`, `13.8.0`, `13.8.0-debian-11-r9` (13/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/13/debian-11/Dockerfile) * [`12`, `12-debian-11`, `12.12.0`, `12.12.0-debian-11-r9` (12/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/12/debian-11/Dockerfile) * [`11`, `11-debian-11`, `11.17.0`, `11.17.0-debian-11-r9` (11/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/11/debian-11/Dockerfile) * [`10`, `10-debian-11`, `10.22.0`, `10.22.0-debian-11-r9` (10/debian-11/Dockerfile)](https://github.com/bitnami/containers/tree/main/bitnami/postgresql/10/debian-11/Dockerfile)