docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-17 13:02:40 +03:00
Code Activity

Merge pull request #657 from J0WI/alpine11

Browse Source 
Upgrade to Alpine 3.11
This commit is contained in:
Tianon Gravi
2020-01-29 14:57:28 -08:00
committed by GitHub
parent 0d0485cb02 c4b019526a
commit 55e3dc0380
8 changed files with 59 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
10/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down

22
11/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down
@@ -54,7 +50,7 @@ RUN set -ex \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
llvm8-dev clang g++ \ llvm9-dev clang g++ \
make \ make \
# openldap-dev \ # openldap-dev \
openssl-dev \ openssl-dev \

22
12/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down
@@ -54,7 +50,7 @@ RUN set -ex \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
llvm8-dev clang g++ \ llvm9-dev clang g++ \
make \ make \
# openldap-dev \ # openldap-dev \
openssl-dev \ openssl-dev \

20
9.4/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down

20
9.5/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down

20
9.6/alpine/Dockerfile
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:3.10 FROM alpine:3.11
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down

20
Dockerfile-alpine.template
View File

@@ -1,17 +1,13 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
FROM alpine:%%ALPINE-VERSION%% FROM alpine:%%ALPINE-VERSION%%
# alpine includes "postgres" user/group in base install # 70 is the standard uid/gid for "postgres" in Alpine
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
# /etc/group:34:postgres:x:70: RUN set -eux; \
# the home directory for the postgres user, however, is not created by default addgroup -g 70 -S postgres; \
# see https://github.com/docker-library/postgres/issues/274 adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql postgres; \
RUN set -ex; \ mkdir -p /var/lib/postgresql; \
postgresHome="$(getent passwd postgres)"; \ chown -R postgres:postgres /var/lib/postgresql
postgresHome="$(echo "$postgresHome" | cut -d: -f6)"; \
[ "$postgresHome" = '/var/lib/postgresql' ]; \
mkdir -p "$postgresHome"; \
chown -R postgres:postgres "$postgresHome"
# su-exec (gosu-compatible) is installed further down # su-exec (gosu-compatible) is installed further down
@@ -54,7 +50,7 @@ RUN set -ex \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
llvm8-dev clang g++ \ llvm9-dev clang g++ \
make \ make \
# openldap-dev \ # openldap-dev \
openssl-dev \ openssl-dev \

2
update.sh
View File

@@ -21,7 +21,7 @@ declare -A debianSuite=(
[10]='stretch-slim' [10]='stretch-slim'
[11]='stretch-slim' [11]='stretch-slim'
) )
defaultAlpineVersion='3.10' defaultAlpineVersion='3.11'
declare -A alpineVersion=( declare -A alpineVersion=(
#[9.6]='3.5' #[9.6]='3.5'
) )