Skip to content

Commit 35d6f4b

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#481 from infosiftr/fix-postgres-home
Fix Debian "postgres" user HOME (to match Debian package)
2 parents 9986244 + 726128b commit 35d6f4b

File tree

7 files changed

+56
-7
lines changed

7 files changed

+56
-7
lines changed

‎10/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎11/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎9.3/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎9.4/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎9.5/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎9.6/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

‎Dockerfile-debian.template

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ RUN set -ex; \
1212
fi
1313

1414
# explicitly set user/group IDs
15-
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
15+
RUN set -eux; \
16+
groupadd -r postgres --gid=999; \
17+
# https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
18+
useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
19+
# also create the postgres user's home directory with appropriate permissions
20+
# see https://github.com/docker-library/postgres/issues/274
21+
mkdir -p /var/lib/postgresql; \
22+
chown -R postgres:postgres /var/lib/postgresql
1623

1724
# grab gosu for easy step-down from root
1825
ENV GOSU_VERSION 1.10

0 commit comments

Comments
 (0)