Skip to content

Commit e091e1f

Browse files
committed
Removed su-exec and added USER to dockerfile.
1 parent dac7bd8 commit e091e1f

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apk add --no-cache --virtual .build-deps gcc g++ make wget pkgconf dpkg-dev
2424
bzip2-dev zlib-dev libuuid linux-headers \
2525
tzdata yaml-dev util-linux-dev && \
2626
apk add --no-cache git bash python3 py3-pip icu libxml2 lz4-dev zstd-dev \
27-
postgresql-dev shadow su-exec && \
27+
postgresql-dev shadow && \
2828
# configure dependencies
2929
ln -sf python3 /usr/bin/python && \
3030
mkdir -p /downloads && \
@@ -62,6 +62,8 @@ RUN chmod 755 /usr/bin/pgbackrest && \
6262

6363
STOPSIGNAL SIGINT
6464

65+
USER $PGUSER
66+
6567
# start database service
6668
ENV PATH=/usr/local/pgsql/bin:$PATH
6769
ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hbaconf="$PGDATA/pg_hba.conf"
55

66
# create db cluster if it's not exist
77
if [[ ! -f $PGDATA/PG_VERSION ]]; then
8-
su-exec $PGUSER initdb --encoding=UTF8 --locale=C -D $PGDATA
8+
initdb --encoding=UTF8 --locale=C -D $PGDATA
99

1010
echo "listen_addresses = '*'" >> $pgconf
1111
echo "port = $PGPORT" >> $pgconf
@@ -18,7 +18,7 @@ fi
1818

1919
# init pgbackrest
2020
if ! grep -q "pgbackrest" "$pgconf"; then
21-
su-exec $PGUSER pg_ctl start -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
21+
pg_ctl start -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
2222

2323
echo "wal_level = replica" >> $pgconf
2424
echo "max_wal_size = 1GB" >> $pgconf
@@ -29,19 +29,19 @@ if ! grep -q "pgbackrest" "$pgconf"; then
2929
echo "log_line_prefix = ''" >> $pgconf
3030
echo "log_timezone = 'Etc/UTC'" >> $pgconf
3131

32-
su-exec $PGUSER pgbackrest --stanza=app --pg1-port=$PGPORT --log-level-console=info stanza-create
33-
su-exec $PGUSER pg_ctl restart -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
32+
pgbackrest --stanza=app --pg1-port=$PGPORT --log-level-console=info stanza-create
33+
pg_ctl restart -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
3434

35-
su-exec $PGUSER pgbackrest --stanza=app --pg1-port=$PGPORT --log-level-console=info check
35+
pgbackrest --stanza=app --pg1-port=$PGPORT --log-level-console=info check
3636
pgbackrest_check_result=$?
3737

3838
if [ $pgbackrest_check_result -ne 0 ]; then
3939
echo "pgbackrest check failed."
4040
exit $pgbackrest_check_result
4141
fi
4242

43-
su-exec $PGUSER pg_ctl stop -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
43+
pg_ctl stop -o "-p $PGPORT -k /var/run/postgresql" -D $PGDATA
4444
fi
4545

4646
# start postgresql server
47-
su-exec $PGUSER "$@"
47+
"$@"

0 commit comments

Comments
 (0)