Skip to content

Commit eb39f06

Browse files
authored
Clean up the PostgreSQL configuration files (#8762)
1 parent a5bd43a commit eb39f06

File tree

7 files changed

+21
-1513
lines changed

7 files changed

+21
-1513
lines changed

toolset/databases/postgres/config.sh

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
cat /tmp/postgresql.conf >> $PGDATA/postgresql.conf
1+
#!/bin/bash
2+
3+
set -e
4+
5+
cat /tmp/postgresql.conf >> "${PGDATA}/postgresql.conf"

toolset/databases/postgres/create-postgres-database.sql

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

toolset/databases/postgres/pg_hba.conf

Lines changed: 0 additions & 100 deletions
This file was deleted.
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
FROM postgres:16-bookworm
22

3-
ENV POSTGRES_USER=benchmarkdbuser
4-
ENV POSTGRES_PASSWORD=benchmarkdbpass
5-
ENV POSTGRES_DB=hello_world
3+
ENV PGDATA=/ssd/postgresql \
4+
POSTGRES_DB=hello_world \
5+
POSTGRES_HOST_AUTH_METHOD=md5 \
6+
POSTGRES_INITDB_ARGS=--auth-host=md5 \
7+
POSTGRES_PASSWORD=benchmarkdbpass \
8+
POSTGRES_USER=benchmarkdbuser
69

7-
ENV POSTGRES_HOST_AUTH_METHOD=md5
8-
ENV POSTGRES_INITDB_ARGS=--auth-host=md5
9-
ENV PGDATA=/ssd/postgresql
10+
COPY postgresql.conf /tmp/
1011

11-
COPY postgresql-min.conf /tmp/postgresql.conf
12-
13-
COPY create-postgres.sql /docker-entrypoint-initdb.d/
14-
COPY config.sh /docker-entrypoint-initdb.d/
12+
COPY config.sh create-postgres.sql /docker-entrypoint-initdb.d/
1513

1614
COPY 60-postgresql-shm.conf /etc/sysctl.d/60-postgresql-shm.conf

toolset/databases/postgres/postgresql-min.conf

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

0 commit comments

Comments
 (0)