diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile index 4ff3e56651ac..e55990657d4e 100644 --- a/bitnami/postgresql/12/debian-10/Dockerfile +++ b/bitnami/postgresql/12/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libnettle6 libp11-kit0 libpcre3 libreadline7 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 "postgresql" "12.8.0-2" --checksum 46f233e122f2aa20e3d9137de84af96b57cfc502975eb4f10afeb2a43911a0d6 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "12.8.0-3" --checksum 0ad53eb0846c8b318609bc92880fd87254b3203d3a7c27bcd36ee64ed2640cf0 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN chmod g+rwX /opt/bitnami RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="12.8.0-debian-10-r33" \ + BITNAMI_IMAGE_VERSION="12.8.0-debian-10-r34" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 693bbe4175fb..1c5655d518a0 100644 --- a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,9 +8,9 @@ }, "postgresql": { "arch": "amd64", - "digest": "46f233e122f2aa20e3d9137de84af96b57cfc502975eb4f10afeb2a43911a0d6", + "digest": "0ad53eb0846c8b318609bc92880fd87254b3203d3a7c27bcd36ee64ed2640cf0", "distro": "debian-10", "type": "NAMI", - "version": "12.8.0-2" + "version": "12.8.0-3" } } \ No newline at end of file diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index a8323db72d93..4265aae0a673 100644 --- a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -141,10 +141,51 @@ am_i_root() { if [[ "$(id -u)" = "0" ]]; then true else - false + false fi } +######################## +# Print OS metadata +# Arguments: +# $1 - Flag name +# Flags: +# --id - Distro ID +# --version - Distro version +# --branch - Distro branch +# --codename - Distro codename +# Returns: +# String +######################### +get_os_metadata() { + local -r flag_name="${1:?missing flag}" + # Helper function + get_os_release_metadata() { + local -r env_name="${1:?missing environment variable name}" + ( + . /etc/os-release + echo "${!env_name}" + ) + } + case "$flag_name" in + --id) + get_os_release_metadata ID + ;; + --version) + get_os_release_metadata VERSION_ID + ;; + --branch) + get_os_release_metadata VERSION_ID | sed 's/\..*//' + ;; + --codename) + get_os_release_metadata VERSION_CODENAME + ;; + *) + error "Unknown flag ${flag_name}" + return 1 + esac +} + ######################## # Get total memory available # Arguments: diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 801f153aba32..45d59958ca0a 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r33` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.4.0-debian-10-r33/13/debian-10/Dockerfile) -* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r33` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r33/12/debian-10/Dockerfile) +* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r34` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r34/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r33`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.13.0-debian-10-r33/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r33` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.18.0-debian-10-r33/10/debian-10/Dockerfile) * [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r33` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.23-debian-10-r33/9.6/debian-10/Dockerfile)