From 7fdc4b7985f5806d04e5ca66d2a7cdd35e93636a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 21 Feb 2024 06:52:09 +0100 Subject: [PATCH] [bitnami/supabase-postgres] Release 15.1.1-debian-12-r12 (#62879) Signed-off-by: Bitnami Containers --- bitnami/supabase-postgres/15/debian-12/Dockerfile | 8 ++++---- .../prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- .../rootfs/opt/bitnami/scripts/postgresql-env.sh | 1 + .../rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh | 6 ++++++ .../rootfs/opt/bitnami/scripts/postgresql/postunpack.sh | 6 +++++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/bitnami/supabase-postgres/15/debian-12/Dockerfile b/bitnami/supabase-postgres/15/debian-12/Dockerfile index c15e1e523ae8..6907eb0ff021 100644 --- a/bitnami/supabase-postgres/15/debian-12/Dockerfile +++ b/bitnami/supabase-postgres/15/debian-12/Dockerfile @@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-02-11T22:19:53Z" \ + org.opencontainers.image.created="2024-02-21T02:13:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.1.1-debian-12-r10" \ + org.opencontainers.image.ref.name="15.1.1-debian-12-r12" \ org.opencontainers.image.title="supabase-postgres" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="15.1.1" @@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libevent-2.1-7 libffi8 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 liblz4-1 liblzma5 libmd0 libmecab2 libmsgpackc2 libncurses6 libnettle8 libnghttp2-14 libnorm1 libp11-kit0 libpcre3 libpgm-5.3-0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl3 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzmq5 libzstd1 locales procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.10-13-1-linux-${OS_ARCH}-debian-12" \ - "supabase-postgres-15.1.1-7-linux-${OS_ARCH}-debian-12" \ + "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \ + "supabase-postgres-15.1.1-8-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/supabase-postgres/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-postgres/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 437381e065b3..7f6765f65932 100644 --- a/bitnami/supabase-postgres/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-postgres/15/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "17.0.10-13-1" + "version": "17.0.10-13-2" }, "supabase-postgres": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "15.1.1-7" + "version": "15.1.1-8" } } \ No newline at end of file diff --git a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql-env.sh index e4fa8f525534..91a35253de37 100644 --- a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql-env.sh +++ b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql-env.sh @@ -181,6 +181,7 @@ export POSTGRESQL_BASE_DIR="/opt/bitnami/postgresql" POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${POSTGRES_DATA_DIR:-}"}" POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${PGDATA:-}"}" export POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-${POSTGRESQL_VOLUME_DIR}/data}" +export POSTGRESQL_DEFAULT_CONF_DIR="$POSTGRESQL_BASE_DIR/conf.default" export POSTGRESQL_CONF_DIR="$POSTGRESQL_BASE_DIR/conf" export POSTGRESQL_MOUNTED_CONF_DIR="$POSTGRESQL_VOLUME_DIR/conf" export POSTGRESQL_CONF_FILE="$POSTGRESQL_CONF_DIR/postgresql.conf" diff --git a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh index 8ea9cb4f10ee..6ab92ebcafd5 100755 --- a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh +++ b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh @@ -21,6 +21,12 @@ print_welcome_page # Enable the nss_wrapper settings postgresql_enable_nss_wrapper +# We add the copy from default config in the entrypoint to not break users +# bypassing the setup.sh logic. If the file already exists do not overwrite (in +# case someone mounts a configuration file in /opt/bitnami/postgresql/conf) +debug "Copying files from $POSTGRESQL_DEFAULT_CONF_DIR to $POSTGRESQL_CONF_DIR" +cp -nr "$POSTGRESQL_DEFAULT_CONF_DIR"/. "$POSTGRESQL_CONF_DIR" + if [[ "$*" = *"/opt/bitnami/scripts/postgresql/run.sh"* ]]; then info "** Starting PostgreSQL setup **" /opt/bitnami/scripts/postgresql/setup.sh diff --git a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh index 544976a70ef0..a2531a5f168f 100755 --- a/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh +++ b/bitnami/supabase-postgres/15/debian-12/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh @@ -11,7 +11,7 @@ # Load PostgreSQL environment variables . /opt/bitnami/scripts/postgresql-env.sh -for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do +for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "$POSTGRESQL_DEFAULT_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do ensure_dir_exists "$dir" done @@ -22,5 +22,9 @@ postgresql_create_config chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR" +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "${POSTGRESQL_CONF_DIR}/"* "$POSTGRESQL_DEFAULT_CONF_DIR" + # Redirect all logging to stdout ln -sf /dev/stdout "$POSTGRESQL_LOG_DIR/postgresql.log"