Skip to content

hotfix: remove self-hosting logic from the supabase/postgres image #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Dockerfile-15
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 1 addition & 7 deletions Dockerfile-17
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 1 addition & 7 deletions Dockerfile-orioledb-17
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
83 changes: 0 additions & 83 deletions docker/docker-entrypoint.sh

This file was deleted.

Loading