8000 hotfix: remove self-hosting logic from the `supabase/postgres` image … · foxgis/supabase-postgres@7dc3610 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7dc3610

Browse files
jgouxjgoux
authored
hotfix: remove self-hosting logic from the supabase/postgres image (supabase#1615)
1 parent b7f1ed1 commit 7dc3610

File tree

5 files changed

+6
-107
lines changed

5 files changed

+6
-107
lines changed

‎Dockerfile-15

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ RUN sed -i \
181181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183183
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
184-
# Remove supabase_admin line from pg_hba.conf
185-
sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
186-
# Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
187-
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 && \
188184
usermod -aG postgres wal-g && \
189185
mkdir -p /etc/postgresql-custom && \
190186
chown postgres:postgres /etc/postgresql-custom
@@ -198,9 +194,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
198194
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
199195
ADD --chmod=0755 \
200196
https://github.com/docker-library/postgres/raw/master/15/bullseye/docker-entrypoint.sh \
201-
/usr/local/bin/upstream-docker-entrypoint.sh
202-
# # Add custom entrypoint script
203-
COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
197+
/usr/local/bin/docker-entrypoint.sh
204198

205199
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
206200

‎Dockerfile-17

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ RUN sed -i \
181181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183183
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
184-
# Remove supabase_admin line from pg_hba.conf
185-
sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
186-
# Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
187-
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 && \
188184
usermod -aG postgres wal-g && \
189185
mkdir -p /etc/postgresql-custom && \
190186
chown postgres:postgres /etc/postgresql-custom
@@ -206,9 +202,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
206202
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
207203
ADD --chmod=0755 \
208204
https://github.com/docker-library/postgres/raw/master/17/bullseye/docker-entrypoint.sh \
209-
/usr/local/bin/upstream-docker-entrypoint.sh
210-
# # Add custom entrypoint script
211-
COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
205+
/usr/local/bin/docker-entrypoint.sh
212206

213207
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
214208

‎Dockerfile-orioledb-17

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ RUN sed -i \
181181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183183
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
184-
# Remove supabase_admin line from pg_hba.conf
185-
sed -i '/local all supabase_admin scram-sha-256/d' /etc/postgresql/pg_hba.conf && \
186-
# Add supabase_admin mappings block to pg_ident.conf before supabase-specific users
187-
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 && \
188184
usermod -aG postgres wal-g && \
189185
mkdir -p /etc/postgresql-custom && \
190186
chown postgres:postgres /etc/postgresql-custom
@@ -211,9 +207,7 @@ RUN echo "CREATE EXTENSION orioledb;" > /docker-entrypoint-initdb.d/init-scripts
211207
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
212208
ADD --chmod=0755 \
213209
https://github.com/docker-library/postgres/raw/master/17/bullseye/docker-entrypoint.sh \
214-
/usr/local/bin/upstream-docker-entrypoint.sh
215-
# # Add custom entrypoint script
216-
COPY --chmod=0755 docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
210+
/usr/local/bin/docker-entrypoint.sh
217211

218212
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
219213

‎ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.0.1.087-orioledb"
13-
postgres17: "17.4.1.037"
14-
postgres15: "15.8.1.094"
12+
postgresorioledb-17: "17.0.1.088-orioledb"
13+
postgres17: "17.4.1.038"
14+
postgres15: "15.8.1.095"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"

‎docker/docker-entrypoint.sh

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0