supabase-postgres.git / summary / log / commit / refs
commit 7dc361080f43813d4e98ccb533445676784e91c3
Author: Julien Goux <julien.goux@live.fr>
Commit: GitHub <noreply@github.com>
Date: Fri May 30 15:25:53 2025 +0000
hotfix: remove self-hosting logic from the `supabase/postgres` image (#1615)
Dockerfile-15 | 8 +----
Dockerfile-17 | 8 +----
Dockerfile-orioledb-17 | 8 +----
ansible/vars.yml | 6 ++--
docker/docker-entrypoint.sh | 83 ---------------------------------------------
5 files changed, 6 insertions(+), 107 deletions(-)
diff --git a/Dockerfile-15 b/Dockerfile-15
index 11781df4..6acf8603 100644
--- a/Dockerfile-15
+++ b/Dockerfile-15
@@ -181,10 +181,6 @@ RUN sed -i \
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
- # Remove supabase_admin line from pg_hba.conf
- sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
- # Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
- sed -i '/# supabase-specific users/i\# supabase_admin user mappings\nsupabase_map postgres supabase_admin\nsupabase_map root supabase_admin\nsupabase_map ubuntu supabase_admin\n' /etc/postgresql/pg_ident.conf && \
usermod -aG postgres wal-g && \
mkdir -p /etc/postgresql-custom && \
chown postgres:postgres /etc/postgresql-custom
@@ -198,9 +194,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
ADD --chmod=0755 \
https://github.com/docker-library/postgres/raw/master/15/bullseye/docker-entrypoint.sh \
- /usr/local/bin/upstream-docker-entrypoint.sh
-# # Add custom entrypoint script
-COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ /usr/local/bin/docker-entrypoint.sh
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
diff --git a/Dockerfile-17 b/Dockerfile-17
index 8dd7a0de..1f1309fc 100644
--- a/Dockerfile-17
+++ b/Dockerfile-17
@@ -181,10 +181,6 @@ RUN sed -i \
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
- # Remove supabase_admin line from pg_hba.conf
- sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
- # Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
- sed -i '/# supabase-specific users/i\# supabase_admin user mappings\nsupabase_map postgres supabase_admin\nsupabase_map root supabase_admin\nsupabase_map ubuntu supabase_admin\n' /etc/postgresql/pg_ident.conf && \
usermod -aG postgres wal-g && \
mkdir -p /etc/postgresql-custom && \
chown postgres:postgres /etc/postgresql-custom
@@ -206,9 +202,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
ADD --chmod=0755 \
https://github.com/docker-library/postgres/raw/master/17/bullseye/docker-entrypoint.sh \
- /usr/local/bin/upstream-docker-entrypoint.sh
-# # Add custom entrypoint script
-COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ /usr/local/bin/docker-entrypoint.sh
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17
index 8b3f9c80..4a0413cb 100644
--- a/Dockerfile-orioledb-17
+++ b/Dockerfile-orioledb-17
@@ -181,10 +181,6 @@ RUN sed -i \
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
- # Remove supabase_admin line from pg_hba.conf
- sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
- # Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
- sed -i '/# supabase-specific users/i\# supabase_admin user mappings\nsupabase_map postgres supabase_admin\nsupabase_map root supabase_admin\nsupabase_map ubuntu supabase_admin\n' /etc/postgresql/pg_ident.conf && \
usermod -aG postgres wal-g && \
mkdir -p /etc/postgresql-custom && \
chown postgres:postgres /etc/postgresql-custom
@@ -211,9 +207,7 @@ RUN echo "CREATE EXTENSION orioledb;" > /docker-entrypoint-initdb.d/init-scripts
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
ADD --chmod=0755 \
https://github.com/docker-library/postgres/raw/master/17/bullseye/docker-entrypoint.sh \
- /usr/local/bin/upstream-docker-entrypoint.sh
-# # Add custom entrypoint script
-COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ /usr/local/bin/docker-entrypoint.sh
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 9a07c087..3a1b08dd 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -9,9 +9,9 @@ postgres_major:
# Full version strings for each major version
postgres_release:
- postgresorioledb-17: "17.0.1.087-orioledb"
- postgres17: "17.4.1.037"
- postgres15: "15.8.1.094"
+ postgresorioledb-17: "17.0.1.088-orioledb"
+ postgres17: "17.4.1.038"
+ postgres15: "15.8.1.095"
# Non Postgres Extensions
pgbouncer_release: "1.19.0"
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
deleted file mode 100755
index 02f38505..00000000
--- a/docker/docker-entrypoint.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-set -Eeo pipefail
-
-source /usr/local/bin/upstream-docker-entrypoint.sh
-
-# sync $POSTGRES_PASSWORD to supabase-specific roles
-pg_sync_password() {
- # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless
- # e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS
- export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
- docker_temp_server_start "$@"
-
- # alter the supabase_admin password
- docker_process_sql <<-'EOSQL'
- \set pgpass `echo "$POSTGRES_PASSWORD"`
- ALTER USER supabase_admin WITH PASSWORD :'pgpass';
- EOSQL
-
- # execute the roles SQL file using docker_process_sql
- docker_process_sql -f /docker-entrypoint-initdb.d/init-scripts/99-roles.sql
-
- docker_temp_server_stop
- unset PGPASSWORD
-}
-
-_main() {
- # if first arg looks like a flag, assume we want to run postgres server
- if [ "${1:0:1}" = '-' ]; then
- set -- postgres "$@"
- fi
-
- if [ "$1" = 'postgres' ] && ! _pg_want_help "$@"; then
- docker_setup_env
- # setup data directories and permissions (when run as root)
- docker_create_db_directories
- if [ "$(id -u)" = '0' ]; then
- # then restart script as postgres user
- exec gosu postgres "$BASH_SOURCE" "$@"
- fi
-
- # only run initialization on an empty data directory
- if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
- docker_verify_minimum_env
-
- # check dir permissions to reduce likelihood of half-initialized database
- ls /docker-entrypoint-initdb.d/ > /dev/null
-
- docker_init_database_dir
- pg_setup_hba_conf "$@"
-
- # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless
- # e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS
- export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
- docker_temp_server_start "$@"
-
- docker_setup_db
- docker_process_init_files /docker-entrypoint-initdb.d/*
-
- docker_temp_server_stop
- unset PGPASSWORD
-
- cat <<-'EOM'
-
- PostgreSQL init process complete; ready for start up.
-
- EOM
- else
- cat <<-'EOM'
-
- PostgreSQL Database directory appears to contain a database; Skipping initialization
-
- EOM
- fi
-
- pg_sync_password "$@"
- fi
-
- exec "$@"
-}
-
-if ! _is_sourced; then
- _main "$@"
-fi
[parent: b7f1ed11bcbd]