Skip to content

Commit 0b5f332

Browse files
author
Muhammad Aqeel
authored
[DISTPG-671]: Fixes postgresql container restart issue. (percona#969)
1 parent 4d23d34 commit 0b5f332

File tree

10 files changed

+40
-20
lines changed

10 files changed

+40
-20
lines changed

‎percona-distribution-postgresql-11/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql11-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit11_set_user \
7274
percona-wal2json11; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-11/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-12/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql12-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit12_set_user \
7274
percona-wal2json12; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-12/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-13/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql13-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit13_set_user \
7274
percona-wal2json13; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-13/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-14/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql14-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit14_set_user \
7274
percona-wal2json14; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-14/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-15/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ RUN set -ex; \
5454
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
5555
-c "Default Application User" postgres
5656

57+
ENV PGDATA /data/db
58+
5759
RUN set -ex; \
5860
dnf install -y \
5961
percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
6567
percona-pgaudit15_set_user \
6668
percona-wal2json15; \
6769
dnf clean all; \
68-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
69-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
70+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
71+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7072

7173
RUN set -ex; \
7274
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-15/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-15/Dockerfile-ol8‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit15_set_user \
7274
percona-wal2json15; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-15/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-15/Dockerfile-ol9‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ RUN set -ex; \
5454
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
5555
-c "Default Application User" postgres
5656

57+
ENV PGDATA /data/db
58+
5759
RUN set -ex; \
5860
dnf install -y \
5961
percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
6567
percona-pgaudit15_set_user \
6668
percona-wal2json15; \
6769
dnf clean all; \
68-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
69-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
70+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
71+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7072

7173
RUN set -ex; \
7274
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-15/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-16/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ RUN set -ex; \
5454
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
5555
-c "Default Application User" postgres
5656

57+
ENV PGDATA /data/db
58+
5759
RUN set -ex; \
5860
dnf install -y \
5961
percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
6567
percona-pgaudit16_set_user \
6668
percona-wal2json16; \
6769
dnf clean all; \
68-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
69-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
70+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
71+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7072

7173
RUN set -ex; \
7274
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-16/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-16/Dockerfile-ol9‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ RUN set -ex; \
5454
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
5555
-c "Default Application User" postgres
5656

57+
ENV PGDATA /data/db
58+
5759
RUN set -ex; \
5860
dnf install -y \
5961
percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
6567
percona-pgaudit16_set_user \
6668
percona-wal2json16; \
6769
dnf clean all; \
68-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
69-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
70+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
71+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7072

7173
RUN set -ex; \
7274
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-16/share/postgresql.conf.sample; \

‎percona-distribution-postgresql-16/Dockerfile_back‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN set -ex; \
6060
rpmkeys --checksig /tmp/perl-JSON.rpm; \
6161
rpm -i /tmp/perl-JSON.rpm
6262

63+
ENV PGDATA /data/db
64+
6365
RUN set -ex; \
6466
microdnf install -y \
6567
percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
7173
percona-pgaudit16_set_user \
7274
percona-wal2json16; \
7375
microdnf clean all; \
74-
rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
75-
chown -R 1001:0 /data/db docker-entrypoint-initdb.d
76+
rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
77+
chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
7678

7779
RUN set -ex; \
7880
sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-16/share/postgresql.conf.sample; \

0 commit comments

Comments
 (0)