From d83af46bcb5a4102339581ff03b22ad3ed8abcac Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 18 Aug 2020 13:16:16 +0000 Subject: [PATCH] 10.14.0-debian-10-r1 release --- bitnami/postgresql/10/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../opt/bitnami/scripts/libservice.sh | 38 ++++++++++++++----- bitnami/postgresql/README.md | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile index b939d598ba6d..16fff0c691a6 100644 --- a/bitnami/postgresql/10/debian-10/Dockerfile +++ b/bitnami/postgresql/10/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 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libp11-kit0 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.14.0-0" --checksum e525910625db87b4cb5ed7ec7aa0ab1e6dc0743bb74b11e3a1b864e01943039f +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.14.0-1" --checksum 87f9f587c3cb2da6701c61d50dceabc8444dfb2b89f1a1cb0e9071d4d8ba392c RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -24,7 +24,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="10.14.0-debian-10-r0" \ + BITNAMI_IMAGE_VERSION="10.14.0-debian-10-r1" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 6abbafc26e9b..a87cb0e44f9d 100644 --- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,9 +8,9 @@ }, "postgresql": { "arch": "amd64", - "digest": "e525910625db87b4cb5ed7ec7aa0ab1e6dc0743bb74b11e3a1b864e01943039f", + "digest": "87f9f587c3cb2da6701c61d50dceabc8444dfb2b89f1a1cb0e9071d4d8ba392c", "distro": "debian-10", "type": "NAMI", - "version": "10.14.0-0" + "version": "10.14.0-1" } } \ No newline at end of file diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 0fa91f65fc4f..55e1dfc4ab28 100644 --- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -6,6 +6,7 @@ # Load Generic Libraries . /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/liblog.sh # Functions @@ -175,23 +176,42 @@ EOF ######################## # Generate a logrotate configuration file # Arguments: -# $1 - Log path -# $2 - Period -# $3 - Number of rotations to store -# $4 - Extra options (Optional) +# $1 - Service name +# $2 - Log files pattern +# Flags: +# --period - Period +# --rotations - Number of rotations to store +# --extra - Extra options (Optional) # Returns: # None ######################### generate_logrotate_conf() { local service_name="${1:?service name is missing}" local log_path="${2:?log path is missing}" - local period="${3:-weekly}" - local rotations="${4:-150}" - local extra_options="${5:-}" + local period="weekly" + local rotations="150" + local extra="" local logrotate_conf_dir="/etc/logrotate.d" + local var_name + # Parse optional CLI flags + shift 2 + while [[ "$#" -gt 0 ]]; do + case "$1" in + --period|--rotations|--extra) + var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" + shift + declare "$var_name"="${1:?"$var_name" is missing}" + ;; + *) + echo "Invalid command line flag ${1}" >&2 + return 1 + ;; + esac + shift + done mkdir -p "$logrotate_conf_dir" - cat >"${logrotate_conf_dir}/${service_name}" <"${logrotate_conf_dir}/${service_name}" ${log_path} { ${period} rotate ${rotations} @@ -199,7 +219,7 @@ ${log_path} { compress copytruncate missingok - ${extra_options} +$(indent "$extra" 2) } EOF } diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 3dd04929fe87..a8dbef07dbfd 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -44,7 +44,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`12-debian-10`, `12.4.0-debian-10-r1`, `12`, `12.4.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.4.0-debian-10-r1/12/debian-10/Dockerfile) * [`11-debian-10`, `11.9.0-debian-10-r1`, `11`, `11.9.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.9.0-debian-10-r1/11/debian-10/Dockerfile) -* [`10-debian-10`, `10.14.0-debian-10-r0`, `10`, `10.14.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.14.0-debian-10-r0/10/debian-10/Dockerfile) +* [`10-debian-10`, `10.14.0-debian-10-r1`, `10`, `10.14.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.14.0-debian-10-r1/10/debian-10/Dockerfile) * [`9.6-debian-10`, `9.6.19-debian-10-r1`, `9.6`, `9.6.19` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.19-debian-10-r1/9.6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).