public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix init scripts and allow them to run on restart

This commit is contained in:
Nathan 2021-10-22 11:42:46 +01:00
parent 40f3b38932
commit 71aa5bec5f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/libpgbouncer.sh
View File

@ -280,9 +280,8 @@ pgbouncer_initialize() {
#########################
pgbouncer_custom_init_scripts() {
info "Loading custom scripts..."
if [[ -d "$PGBOUNCER_INITSCRIPTS_DIR" ]] && [[ -n $(find "$PGBOUNCER_INITSCRIPTS_DIR/" -type f -regex ".*\.sh") ]] && [[ ! -f "$PGBOUNCER_VOLUME_DIR/.user_scripts_initialized" ]]; then
if [[ -d "$PGBOUNCER_INITSCRIPTS_DIR" ]] && [[ -n $(find "$PGBOUNCER_INITSCRIPTS_DIR/" -type f -regex ".*\.sh") ]] && [[ ! -f "$PGBOUNCER_VOLUME_DIR/.user_scripts_initialized" || "$PGBOUNCER_FORCE_INITSCRIPTS" == "true" ]]; then
info "Loading user's custom files from $PGBOUNCER_INITSCRIPTS_DIR ..."
postgresql_start_bg
find "$PGBOUNCER_INITSCRIPTS_DIR/" -type f -regex ".*\.sh" | sort | while read -r f; do
case "$f" in
*.sh)

2
bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
View File

@ -56,6 +56,7 @@ pgbouncer_env_vars=(
PGBOUNCER_SET_DATABASE_USER
PGBOUNCER_DAEMON_USER
PGBOUNCER_DAEMON_GROUP
PGBOUNCER_FORCE_INITSCRIPTS
)
for env_var in "${pgbouncer_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@ -100,6 +101,7 @@ export PGBOUNCER_MIN_POOL_SIZE="${PGBOUNCER_MIN_POOL_SIZE:-}"
export PGBOUNCER_RESERVE_POOL_SIZE="${PGBOUNCER_RESERVE_POOL_SIZE:-}"
export PGBOUNCER_IGNORE_STARTUP_PARAMETERS="${PGBOUNCER_IGNORE_STARTUP_PARAMETERS:-}"
export PGBOUNCER_EXTRA_FLAGS="${PGBOUNCER_EXTRA_FLAGS:-}"
export PGBOUNCER_FORCE_INITSCRIPTS="${PGBOUNCER_FORCE_INITSCRIPTS:-false}"
# Client TLS settings
export PGBOUNCER_CLIENT_TLS_SSLMODE="${PGBOUNCER_CLIENT_TLS_SSLMODE:-disable}"

2
bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer/postunpack.sh
View File

@ -16,7 +16,7 @@ set -o pipefail
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/liblog.sh
for dir in "$PGBOUNCER_CONF_DIR" "$PGBOUNCER_LOG_DIR" "$PGBOUNCER_TMP_DIR" "$PGBOUNCER_MOUNTED_CONF_DIR" "$PGBOUNCER_INITSCRIPTS_DIR"; do
for dir in "$PGBOUNCER_CONF_DIR" "$PGBOUNCER_LOG_DIR" "$PGBOUNCER_TMP_DIR" "$PGBOUNCER_MOUNTED_CONF_DIR" "$PGBOUNCER_INITSCRIPTS_DIR" "$PGBOUNCER_VOLUME_DIR"; do
ensure_dir_exists "$dir"
chmod -R g+rwX "$dir"
done