From fce9d701629384f8315b5c0973aa62f722ced8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Thu, 24 Aug 2017 17:42:08 +0200 Subject: [PATCH 1/9] Update Dockerfile for 9.5 USER 1001 --- 9.5/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 6ee68e41c9..f9eff70daa 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -12,7 +12,9 @@ RUN set -ex; \ fi # explicitly set user/group IDs -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres + +USER 1001: # grab gosu for easy step-down from root ENV GOSU_VERSION 1.7 From 5252ae364db9cc474d5dac47d133b6e9edb8cc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Thu, 24 Aug 2017 17:52:01 +0200 Subject: [PATCH 2/9] Previous user test --- 9.5/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index f9eff70daa..fbc8262bb2 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -12,9 +12,9 @@ RUN set -ex; \ fi # explicitly set user/group IDs -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres -USER 1001: +USER 999 # grab gosu for easy step-down from root ENV GOSU_VERSION 1.7 From 96e7c9ed4a23657aeeffcd94f1f4ecfb56ec74a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Thu, 24 Aug 2017 17:54:50 +0200 Subject: [PATCH 3/9] Test with no USER --- 9.5/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index fbc8262bb2..36c848e44e 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex; \ # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres -USER 999 +#USER 999 # grab gosu for easy step-down from root ENV GOSU_VERSION 1.7 From 811d3396511a9208c99a71db87c8bb45a97da23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Thu, 24 Aug 2017 18:04:27 +0200 Subject: [PATCH 4/9] New test with 1001 user --- 9.5/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 36c848e44e..1f3b0aaa15 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -12,9 +12,8 @@ RUN set -ex; \ fi # explicitly set user/group IDs -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres -#USER 999 # grab gosu for easy step-down from root ENV GOSU_VERSION 1.7 @@ -61,6 +60,8 @@ RUN apt-get update \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ && rm -rf /var/lib/apt/lists/* +USER 1001 + # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ && ln -sv ../postgresql.conf.sample /usr/share/postgresql/$PG_MAJOR/ \ From 9fa3914677e40440fe4dc24452f0823f2b83ab89 Mon Sep 17 00:00:00 2001 From: JeremyBesson Date: Thu, 24 Aug 2017 19:25:58 +0200 Subject: [PATCH 5/9] Edit 9.5 Dockerfile USER before ENTRYPOINT --- 9.5/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 1f3b0aaa15..2f2191de90 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -60,7 +60,6 @@ RUN apt-get update \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ && rm -rf /var/lib/apt/lists/* -USER 1001 # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ @@ -76,6 +75,7 @@ VOLUME /var/lib/postgresql/data COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +USER 1001 ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 From 9e29c79496d9d218564212fd45d8ed2d54405c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Tue, 29 Aug 2017 11:21:30 +0200 Subject: [PATCH 6/9] Test with USER 1000008000 --- 9.5/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 1f3b0aaa15..1ed59cc36d 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -12,7 +12,8 @@ RUN set -ex; \ fi # explicitly set user/group IDs -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres +#RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1000080001 postgres # grab gosu for easy step-down from root @@ -60,7 +61,7 @@ RUN apt-get update \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ && rm -rf /var/lib/apt/lists/* -USER 1001 +USER 1000080001 # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ From 691d5f0cc7626e72cd61088a69756ae809179932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Tue, 29 Aug 2017 13:20:31 +0200 Subject: [PATCH 7/9] Return to user 1001 : no space left on device with 1000008000 --- 9.5/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 08dbecc4d1..8c517c8ea9 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -13,7 +13,7 @@ RUN set -ex; \ # explicitly set user/group IDs #RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1000080001 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres # grab gosu for easy step-down from root @@ -61,7 +61,7 @@ RUN apt-get update \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ && rm -rf /var/lib/apt/lists/* -USER 1000080001 +USER 1001 # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ From 01c2561ff9caec0ace6d0e9b2801654df2e2ce2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Tue, 29 Aug 2017 14:48:12 +0200 Subject: [PATCH 8/9] Rm useless line with USER --- 9.5/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 8c517c8ea9..396d1633b7 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -61,8 +61,6 @@ RUN apt-get update \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ && rm -rf /var/lib/apt/lists/* -USER 1001 - # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ && ln -sv ../postgresql.conf.sample /usr/share/postgresql/$PG_MAJOR/ \ From 608a10f648ce68b05e96df3720464f9e37d97da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Besson?= Date: Wed, 30 Aug 2017 10:10:29 +0200 Subject: [PATCH 9/9] USER 10000080000 with one USER --- 9.5/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 396d1633b7..43d7a3d1ca 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -13,8 +13,8 @@ RUN set -ex; \ # explicitly set user/group IDs #RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres -RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres - +#RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres +RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1000080001 postgres # grab gosu for easy step-down from root ENV GOSU_VERSION 1.7 @@ -75,7 +75,7 @@ VOLUME /var/lib/postgresql/data COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat -USER 1001 +USER 1000080001 ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432