File tree Expand file tree Collapse file tree 4 files changed +3
-105
lines changed Expand file tree Collapse file tree 4 files changed +3
-105
lines changed Original file line number Diff line number Diff line change @@ -181,10 +181,6 @@ RUN sed -i \
181
181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182
182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183
183
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 && \
188
184
usermod -aG postgres wal-g && \
189
185
mkdir -p /etc/postgresql-custom && \
190
186
chown postgres:postgres /etc/postgresql-custom
@@ -198,9 +194,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
198
194
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
199
195
ADD --chmod=0755 \
200
196
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
204
198
205
199
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
206
200
Original file line number Diff line number Diff line change @@ -181,10 +181,6 @@ RUN sed -i \
181
181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182
182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183
183
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 && \
188
184
usermod -aG postgres wal-g && \
189
185
mkdir -p /etc/postgresql-custom && \
190
186
chown postgres:postgres /etc/postgresql-custom
@@ -206,9 +202,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
206
202
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
207
203
ADD --chmod=0755 \
208
204
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
212
206
213
207
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
214
208
Original file line number Diff line number Diff line change @@ -181,10 +181,6 @@ RUN sed -i \
181
181
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
182
182
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
183
183
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 && \
188
184
usermod -aG postgres wal-g && \
189
185
mkdir -p /etc/postgresql-custom && \
190
186
chown postgres:postgres /etc/postgresql-custom
@@ -211,9 +207,7 @@ RUN echo "CREATE EXTENSION orioledb;" > /docker-entrypoint-initdb.d/init-scripts
211
207
COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
212
208
ADD --chmod=0755 \
213
209
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
217
211
218
212
RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
219
213
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments