Merge pull request #910 from J0WI/alpine-3.15

Alpine 3.15
This commit is contained in:
Tianon Gravi 2021-11-29 15:08:07 -08:00 committed by GitHub
commit f5225fd4fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions

2
10/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable

4
11/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@ -51,7 +51,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm11-dev clang g++ \
llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \

4
12/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@ -51,7 +51,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm11-dev clang g++ \
llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \

4
13/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@ -51,7 +51,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm11-dev clang g++ \
llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \

4
14/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@ -51,7 +51,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
llvm11-dev clang g++ \
llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \

2
9.6/alpine/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.14
FROM alpine:3.15
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable

View File

@ -46,7 +46,7 @@ RUN set -eux; \
libxslt-dev \
linux-headers \
{{ if .major >= 11 then ( -}}
llvm11-dev clang g++ \
llvm-dev clang g++ \
{{ ) else "" end -}}
make \
openldap-dev \

View File

@ -1,6 +1,6 @@
{
"10": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
@ -27,7 +27,7 @@
"version": "10.19"
},
"11": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
@ -54,7 +54,7 @@
"version": "11.14"
},
"12": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
@ -72,7 +72,7 @@
"version": "12.9"
},
"13": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
@ -90,7 +90,7 @@
"version": "13.5"
},
"14": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
@ -108,7 +108,7 @@
"version": "14.1"
},
"9.6": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",

View File

@ -12,7 +12,7 @@ allDebianSuites=(
bullseye
stretch
)
defaultAlpineVersion='3.14'
defaultAlpineVersion='3.15'
declare -A alpineVersions=(
#[9.6]='3.5'
)