From 1cbd3a1666e6294cc28fa41c24983494dfcfc680 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 20 Dec 2019 04:05:38 +0100 Subject: [PATCH 1/4] Upgrade to Alpine 3.11 --- 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 +- update.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 76c5c5f618..4a1b1d9d1c 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index ad1fb13690..5264a065c3 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 082735446d..650fabc1e4 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 97c7a48be4..3d4684067e 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 7cfaaad99f..91838507af 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index e349927093..a53672ce32 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM alpine:3.10 +FROM alpine:3.11 # alpine includes "postgres" user/group in base install # /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh diff --git a/update.sh b/update.sh index 528fbce56d..fe98610e51 100755 --- a/update.sh +++ b/update.sh @@ -21,7 +21,7 @@ declare -A debianSuite=( [10]='stretch-slim' [11]='stretch-slim' ) -defaultAlpineVersion='3.10' +defaultAlpineVersion='3.11' declare -A alpineVersion=( #[9.6]='3.5' ) From ada31ea8dc1dd01a613eebd8f0d12ad1fc2f1757 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 23 Dec 2019 02:21:09 +0100 Subject: [PATCH 2/4] Add postgres directory and user --- 10/alpine/Dockerfile | 18 +++++++----------- 11/alpine/Dockerfile | 18 +++++++----------- 12/alpine/Dockerfile | 18 +++++++----------- 9.4/alpine/Dockerfile | 18 +++++++----------- 9.5/alpine/Dockerfile | 18 +++++++----------- 9.6/alpine/Dockerfile | 18 +++++++----------- Dockerfile-alpine.template | 18 +++++++----------- 7 files changed, 49 insertions(+), 77 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 4a1b1d9d1c..b3e06e4699 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 5264a065c3..7802e06a13 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 650fabc1e4..601ea39ea5 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 3d4684067e..5999fc5dba 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 91838507af..07afd887cb 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index a53672ce32..461bcf51f0 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 877d8ee452..129b329177 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,17 +1,13 @@ # vim:set ft=dockerfile: FROM alpine:%%ALPINE-VERSION%% -# alpine includes "postgres" user/group in base install -# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh -# /etc/group:34:postgres:x:70: -# the home directory for the postgres user, however, is not created by default -# see https://github.com/docker-library/postgres/issues/274 -RUN set -ex; \ - postgresHome="$(getent passwd postgres)"; \ - postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \ - [ "$postgresHome" = '/var/lib/postgresql' ]; \ - mkdir -p "$postgresHome"; \ - chown -R postgres:postgres "$postgresHome" +# 70 is the standard uid/gid for "postgres" in Alpine +# 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 postgres; \ + mkdir -p /var/lib/postgresql; \ + chown -R postgres:postgres /var/lib/postgresql # su-exec (gosu-compatible) is installed further down From 52814abac491eca146620f921a44e2cb4217088e Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 23 Dec 2019 19:34:41 +0100 Subject: [PATCH 3/4] Bump LLVM to 9 --- 11/alpine/Dockerfile | 2 +- 12/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 7802e06a13..9b478baf8b 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -50,7 +50,7 @@ RUN set -ex \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm8-dev clang g++ \ + llvm9-dev clang g++ \ make \ # openldap-dev \ openssl-dev \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 601ea39ea5..a8a78d2b6d 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -50,7 +50,7 @@ RUN set -ex \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm8-dev clang g++ \ + llvm9-dev clang g++ \ make \ # openldap-dev \ openssl-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 129b329177..c9673b0d4f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -50,7 +50,7 @@ RUN set -ex \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm8-dev clang g++ \ + llvm9-dev clang g++ \ make \ # openldap-dev \ openssl-dev \ From c4b019526a25d1300de77b9699d53ad187cf0dcf Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 1 Jan 2020 01:31:50 +0100 Subject: [PATCH 4/4] Add home dir --- 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 b3e06e4699..bea8f1c794 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 9b478baf8b..414d58c688 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index a8a78d2b6d..c2586bec7f 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql 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 5999fc5dba..a03de96134 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql 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 07afd887cb..eea27143a7 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql 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 461bcf51f0..b631b0b50c 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c9673b0d4f..e1b4a6f947 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 postgres; \ + adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \ mkdir -p /var/lib/postgresql; \ chown -R postgres:postgres /var/lib/postgresql