Skip to content

Commit 55e3dc0

Browse files
tianontianon
authored
Merge pull request #657 from J0WI/alpine11
Upgrade to Alpine 3.11
2 parents 0d0485c + c4b0195 commit 55e3dc0

File tree

8 files changed

+59
-87
lines changed

8 files changed

+59
-87
lines changed

Diff for: ‎10/alpine/Dockerfile

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

Diff for: ‎11/alpine/Dockerfile

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

@@ -54,7 +50,7 @@ RUN set -ex \
5450
libxml2-dev \
5551
libxslt-dev \
5652
linux-headers \
57-
llvm8-dev clang g++ \
53+
llvm9-dev clang g++ \
5854
make \
5955
# openldap-dev \
6056
openssl-dev \

Diff for: ‎12/alpine/Dockerfile

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

@@ -54,7 +50,7 @@ RUN set -ex \
5450
libxml2-dev \
5551
libxslt-dev \
5652
linux-headers \
57-
llvm8-dev clang g++ \
53+
llvm9-dev clang g++ \
5854
make \
5955
# openldap-dev \
6056
openssl-dev \

Diff for: ‎9.4/alpine/Dockerfile

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

Diff for: ‎9.5/alpine/Dockerfile

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

Diff for: ‎9.6/alpine/Dockerfile

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
2-
FROM alpine:3.10
2+
FROM alpine:3.11
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

Diff for: ‎Dockerfile-alpine.template

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# vim:set ft=dockerfile:
22
FROM alpine:%%ALPINE-VERSION%%
33

4-
# alpine includes "postgres" user/group in base install
5-
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
6-
# /etc/group:34:postgres:x:70:
7-
# the home directory for the postgres user, however, is not created by default
8-
# see https://github.com/docker-library/postgres/issues/274
9-
RUN set -ex; \
10-
postgresHome="$(getent passwd postgres)"; \
11-
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
12-
[ "$postgresHome" = '/var/lib/postgresql' ]; \
13-
mkdir -p "$postgresHome"; \
14-
chown -R postgres:postgres "$postgresHome"
4+
# 70 is the standard uid/gid for "postgres" in Alpine
5+
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
6+
RUN set -eux; \
7+
addgroup -g 70 -S postgres; \
8+
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
9+
mkdir -p /var/lib/postgresql; \
10+
chown -R postgres:postgres /var/lib/postgresql
1511

1612
# su-exec (gosu-compatible) is installed further down
1713

@@ -54,7 +50,7 @@ RUN set -ex \
5450
libxml2-dev \
5551
libxslt-dev \
5652
linux-headers \
57-
llvm8-dev clang g++ \
53+
llvm9-dev clang g++ \
5854
make \
5955
# openldap-dev \
6056
openssl-dev \

Diff for: ‎update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ declare -A debianSuite=(
2121
[10]='stretch-slim'
2222
[11]='stretch-slim'
2323
)
24-
defaultAlpineVersion='3.10'
24+
defaultAlpineVersion='3.11'
2525
declare -A alpineVersion=(
2626
#[9.6]='3.5'
2727
)

0 commit comments

Comments
 (0)