From da0807e8c9e87d4e71e54868f9c91e046858dab8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 22 Mar 2023 04:01:34 +0100 Subject: [PATCH] [bitnami/pgpool] Release 4.4.2-debian-11-r17 (#28038) Signed-off-by: Bitnami Containers --- bitnami/pgpool/4/debian-11/Dockerfile | 12 +++--- .../opt/bitnami/.bitnami_components.json | 16 ++++---- .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- bitnami/pgpool/README.md | 1 - 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/bitnami/pgpool/4/debian-11/Dockerfile b/bitnami/pgpool/4/debian-11/Dockerfile index 08737787313b..8e9d9b50701f 100644 --- a/bitnami/pgpool/4/debian-11/Dockerfile +++ b/bitnami/pgpool/4/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-14T05:42:23Z" \ + org.opencontainers.image.created="2023-03-22T02:17:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.4.2-debian-11-r16" \ + org.opencontainers.image.ref.name="4.4.2-debian-11-r17" \ org.opencontainers.image.title="pgpool" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.4.2" @@ -22,10 +22,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl ldap-utils libaudit1 libbsd0 libcap-ng0 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 libldap-common liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpam-ldapd libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 nslcd procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "postgresql-client-14.7.0-1-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "pgpool-4.4.2-2-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-14.7.0-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "pgpool-4.4.2-3-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d2fed107fa90..c8054acad733 100644 --- a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,30 +1,30 @@ { "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" }, "pgpool": { "arch": "amd64", - "digest": "97cd5266b133b64400d7daf105bbced5972d77f53b68d96b829c982e7ea60265", + "digest": "0b95a32ce9e38c92e531c2255b4191045325021572b0e9123d824ca50617e6ef", "distro": "debian-11", "type": "NAMI", - "version": "4.4.2-2" + "version": "4.4.2-3" }, "postgresql-client": { "arch": "amd64", - "digest": "fd6d0139da68f4b4352ddb527e93bbc4ff30583ab27e6c707bf7eaaf670f36c5", + "digest": "bf2224cf2898fa069e8f5e994dcaaa1c46254a6ad7f2ac855f670d897ce0db7c", "distro": "debian-11", "type": "NAMI", - "version": "14.7.0-1" + "version": "14.7.0-2" }, "wait-for-port": { "arch": "amd64", - "digest": "be7c393d598ddf16d1c3c008a67b87879e48aca62071a208583390f2b41e6744", + "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-2" } } \ No newline at end of file diff --git a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -281,6 +281,8 @@ remove_logrotate_conf() { # --environment - Environment variable to define (multiple --environment options may be passed) # --environment-file - Text file with environment variables # --exec-start - Start command (required) +# --exec-start-pre - Pre-start command (optional) +# --exec-start-post - Post-start command (optional) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) # --group - System group to start the service with @@ -292,6 +294,7 @@ remove_logrotate_conf() { # --success-exit-status - Exit code that indicates a successful shutdown # --type - Systemd unit type (defaults to forking) # --user - System user to start the service with +# --working-directory - Working directory at which to start the service # Returns: # None ######################### @@ -307,6 +310,8 @@ generate_systemd_conf() { local environment="" local environment_file="" local exec_start="" + local exec_start_pre="" + local exec_start_post="" local exec_stop="" local exec_reload="" local restart="always" @@ -316,6 +321,7 @@ generate_systemd_conf() { local limits_content="" local success_exit_status="" local custom_service_content="" + local working_directory="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -334,6 +340,7 @@ generate_systemd_conf() { | --standard-error \ | --success-exit-status \ | --custom-service-content \ + | --working-directory \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -345,11 +352,21 @@ generate_systemd_conf() { shift limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; + --exec-start-pre) + shift + [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' + exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" + ;; + --exec-start-post) + shift + [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' + exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" + ;; --environment) shift # It is possible to add multiple environment lines [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"environment" is missing}" + environment+="Environment=${1:?"--environment value is missing"}" ;; *) echo "Invalid command line flag ${1}" >&2 @@ -376,8 +393,21 @@ PartOf=bitnami.service [Service] Type=${type} -ExecStart=${exec_start} EOF + if [[ -n "$working_directory" ]]; then + cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + fi + if [[ -n "$exec_start_pre" ]]; then + # This variable may contain multiple ExecStartPre= directives + cat >> "$service_file" <<< "$exec_start_pre" + fi + if [[ -n "$exec_start" ]]; then + cat >> "$service_file" <<< "ExecStart=${exec_start}" + fi + if [[ -n "$exec_start_post" ]]; then + # This variable may contain multiple ExecStartPost= directives + cat >> "$service_file" <<< "$exec_start_post" + fi # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then cat >> "$service_file" <<< "ExecStop=${exec_stop}" @@ -399,8 +429,9 @@ EOF if [[ -n "$restart" ]]; then cat >> "$service_file" <<< "Restart=${restart}" fi - # Environment flags (may be specified multiple times in a unit) + # Environment flags if [[ -n "$environment" ]]; then + # This variable may contain multiple Environment= directives cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then @@ -414,6 +445,7 @@ EOF cat >> "$service_file" <<< "StandardError=${standard_error}" fi if [[ -n "$custom_service_content" ]]; then + # This variable may contain multiple miscellaneous directives cat >> "$service_file" <<< "$custom_service_content" fi if [[ -n "$success_exit_status" ]]; then @@ -424,7 +456,8 @@ EOF fi cat >> "$service_file" < Pgpool-II is the PostgreSQL proxy. It stands between PostgreSQL servers and their clients providing connection pooling, load balancing, automated failover, and replication. [Overview of Pgpool-II](http://pgpool.net/) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR