Merge pull request #1023 from J0WI/alpine-3.12

Add Alpine 3.12

.travis.yml

@@ -6,12 +6,12 @@ env:
   - VERSION=7.4 VARIANT=buster/apache
   - VERSION=7.4 VARIANT=buster/fpm
   - VERSION=7.4 VARIANT=buster/zts
+  - VERSION=7.4 VARIANT=alpine3.12/cli
+  - VERSION=7.4 VARIANT=alpine3.12/fpm
+  - VERSION=7.4 VARIANT=alpine3.12/zts
   - VERSION=7.4 VARIANT=alpine3.11/cli
   - VERSION=7.4 VARIANT=alpine3.11/fpm
   - VERSION=7.4 VARIANT=alpine3.11/zts
-  - VERSION=7.4 VARIANT=alpine3.10/cli
-  - VERSION=7.4 VARIANT=alpine3.10/fpm
-  - VERSION=7.4 VARIANT=alpine3.10/zts
   - VERSION=7.3 VARIANT=buster/cli
   - VERSION=7.3 VARIANT=buster/apache
   - VERSION=7.3 VARIANT=buster/fpm
@@ -20,12 +20,12 @@ env:
   - VERSION=7.3 VARIANT=stretch/apache
   - VERSION=7.3 VARIANT=stretch/fpm
   - VERSION=7.3 VARIANT=stretch/zts
+  - VERSION=7.3 VARIANT=alpine3.12/cli
+  - VERSION=7.3 VARIANT=alpine3.12/fpm
+  - VERSION=7.3 VARIANT=alpine3.12/zts
   - VERSION=7.3 VARIANT=alpine3.11/cli
   - VERSION=7.3 VARIANT=alpine3.11/fpm
   - VERSION=7.3 VARIANT=alpine3.11/zts
-  - VERSION=7.3 VARIANT=alpine3.10/cli
-  - VERSION=7.3 VARIANT=alpine3.10/fpm
-  - VERSION=7.3 VARIANT=alpine3.10/zts
   - VERSION=7.2 VARIANT=buster/cli
   - VERSION=7.2 VARIANT=buster/apache
   - VERSION=7.2 VARIANT=buster/fpm
@@ -34,12 +34,12 @@ env:
   - VERSION=7.2 VARIANT=stretch/apache
   - VERSION=7.2 VARIANT=stretch/fpm
   - VERSION=7.2 VARIANT=stretch/zts
+  - VERSION=7.2 VARIANT=alpine3.12/cli
+  - VERSION=7.2 VARIANT=alpine3.12/fpm
+  - VERSION=7.2 VARIANT=alpine3.12/zts
   - VERSION=7.2 VARIANT=alpine3.11/cli
   - VERSION=7.2 VARIANT=alpine3.11/fpm
   - VERSION=7.2 VARIANT=alpine3.11/zts
-  - VERSION=7.2 VARIANT=alpine3.10/cli
-  - VERSION=7.2 VARIANT=alpine3.10/fpm
-  - VERSION=7.2 VARIANT=alpine3.10/zts
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

7.2/alpine3.12/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.2/alpine3.12/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.2/alpine3.12/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.3/alpine3.12/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.3/alpine3.12/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.3/alpine3.12/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.4/alpine3.12/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.4/alpine3.12/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

7.4/alpine3.12/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.10
+FROM alpine:3.12
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

generate-stackbrew-library.sh

@@ -10,7 +10,7 @@ defaultDebianSuite='buster'
 declare -A debianSuites=(
 	#[7.4-rc]='buster'
 )
-defaultAlpineVersion='3.11'
+defaultAlpineVersion='3.12'
 declare -A alpineVersions=(
 	# /usr/src/php/ext/openssl/openssl.c:551:12: error: static declaration of 'RSA_set0_key' follows non-static declaration
 	# https://github.com/docker-library/php/pull/702#issuecomment-413341743
@@ -89,7 +89,7 @@ for version in "${versions[@]}"; do
 	# order here controls the order of the library/ file
 	for suite in \
 		buster stretch \
-		alpine{3.11,3.10} \
+		alpine{3.12,3.11} \
 	; do
 		for variant in \
 			cli \

update.sh

@@ -116,7 +116,7 @@ for version in "${versions[@]}"; do
 
 	dockerfiles=()
 
-	for suite in buster stretch alpine{3.11,3.10}; do
+	for suite in buster stretch alpine{3.12,3.11}; do
 		[ -d "$version/$suite" ] || continue
 		alpineVer="${suite#alpine}"