From 0b0c2db6f2b24c7b74b0208502764b08b1d4a9bd Mon Sep 17 00:00:00 2001 From: ZhenShaw <1614570038@qq.com> Date: Thu, 13 Feb 2020 23:17:48 +0800 Subject: [PATCH] Fix #674 create postgres user with login shell /bin/sh --- 10/alpine/Dockerfile | 2 +- 11/alpine/Dockerfile | 2 +- 12/alpine/Dockerfile | 2 +- 9.4/alpine/Dockerfile | 2 +- 9.5/alpine/Dockerfile | 2 +- 9.6/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index bea8f1c794..fabbe60333 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 414d58c688..50e496eaa4 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index c2586bec7f..ad99c63a2b 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index a03de96134..9de96e494b 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index eea27143a7..53357d4573 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index b631b0b50c..c72fa945bd 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.11 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index e1b4a6f947..7819ce02a6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -5,7 +5,7 @@ FROM alpine:%%ALPINE-VERSION%% # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable RUN set -eux; \ addgroup -g 70 -S postgres; \ - adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql