From 0e89063223b2da4fa76a8cb5de9aa859f233803f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 4 Feb 2022 17:05:08 +0000 Subject: [PATCH] 12.9.0-debian-10-r81 release --- bitnami/postgresql/12/debian-10/Dockerfile | 5 ++++- .../rootfs/opt/bitnami/scripts/postgresql-env.sh | 2 ++ .../rootfs/opt/bitnami/scripts/postgresql/run.sh | 8 ++++++++ bitnami/postgresql/README.md | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile index af03ef084c05..1ed1d3ccc95e 100644 --- a/bitnami/postgresql/12/debian-10/Dockerfile +++ b/bitnami/postgresql/12/debian-10/Dockerfile @@ -6,6 +6,9 @@ ENV HOME="/" \ OS_FLAVOUR="debian-10" \ OS_NAME="linux" +ARG EXTRA_LOCALES="" +ARG WITH_ALL_LOCALES="no" + 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 libncurses6 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 @@ -24,7 +27,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.9.0-debian-10-r80" \ + BITNAMI_IMAGE_VERSION="12.9.0-debian-10-r81" \ 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/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh index bdc383c20ee2..a3bb7079e93c 100644 --- a/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh +++ b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh @@ -23,6 +23,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" postgresql_env_vars=( POSTGRESQL_VOLUME_DIR POSTGRESQL_DATA_DIR + POSTGRESQL_EXTRA_FLAGS POSTGRESQL_INIT_MAX_TIMEOUT POSTGRESQL_PGCTLTIMEOUT POSTGRESQL_SHUTDOWN_MODE @@ -189,6 +190,7 @@ export POSTGRESQL_DAEMON_USER="postgres" export POSTGRESQL_DAEMON_GROUP="postgres" # PostgreSQL settings +export POSTGRESQL_EXTRA_FLAGS="${POSTGRESQL_EXTRA_FLAGS:-}" export POSTGRESQL_INIT_MAX_TIMEOUT="${POSTGRESQL_INIT_MAX_TIMEOUT:-60}" export POSTGRESQL_PGCTLTIMEOUT="${POSTGRESQL_PGCTLTIMEOUT:-60}" POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-"${POSTGRES_SHUTDOWN_MODE:-}"}" diff --git a/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh index a84454655f70..38cb7c8ec5a2 100755 --- a/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh +++ b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh @@ -15,6 +15,14 @@ set -o pipefail . /opt/bitnami/scripts/postgresql-env.sh flags=("-D" "$POSTGRESQL_DATA_DIR" "--config-file=$POSTGRESQL_CONF_FILE" "--external_pid_file=$POSTGRESQL_PID_FILE" "--hba_file=$POSTGRESQL_PGHBA_FILE") + +if [[ -n "${POSTGRESQL_EXTRA_FLAGS:-}" ]]; then + read -r -a extra_flags <<< "$POSTGRESQL_EXTRA_FLAGS" + flags+=("${extra_flags[@]}") +fi + +flags+=("$@") + cmd=$(command -v postgres) info "** Starting PostgreSQL **" diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 1db514dc32e8..1cf7e7523c71 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`14`, `14-debian-10`, `14.1.0`, `14.1.0-debian-10-r82`, `latest` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/14.1.0-debian-10-r82/14/debian-10/Dockerfile) * [`13`, `13-debian-10`, `13.5.0`, `13.5.0-debian-10-r80` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.5.0-debian-10-r80/13/debian-10/Dockerfile) -* [`12`, `12-debian-10`, `12.9.0`, `12.9.0-debian-10-r80` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.9.0-debian-10-r80/12/debian-10/Dockerfile) +* [`12`, `12-debian-10`, `12.9.0`, `12.9.0-debian-10-r81` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.9.0-debian-10-r81/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.14.0`, `11.14.0-debian-10-r51` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.14.0-debian-10-r51/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.19.0`, `10.19.0-debian-10-r82` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.19.0-debian-10-r82/10/debian-10/Dockerfile)