Merge pull request #742 from J0WI/alpine-3.12

Upgrade Alpine to 3.12
This commit is contained in:
Tianon Gravi 2020-06-10 15:39:54 -07:00 committed by GitHub
commit 9586595a9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@ -50,7 +50,7 @@ RUN set -ex \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm9-dev clang g++ \
llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@ -50,7 +50,7 @@ RUN set -ex \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm9-dev clang g++ \
llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@ -50,7 +50,7 @@ RUN set -ex \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm9-dev clang g++ \
llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

View File

@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
FROM alpine:3.12
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

View File

@ -2,7 +2,7 @@
FROM alpine:%%ALPINE-VERSION%%
# 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
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@ -50,7 +50,7 @@ RUN set -ex \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm9-dev clang g++ \
llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \

View File

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