From 99e1354f4857961b9c9902e0ae6b1776cbcc3df9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 10 Jun 2020 23:36:01 +0200 Subject: [PATCH] Add Alpine 3.12 --- .travis.yml | 18 +++++++++--------- 7.2/{alpine3.10 => alpine3.12}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 7.2/{alpine3.10 => alpine3.12}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 7.2/{alpine3.10 => alpine3.12}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 7.3/{alpine3.10 => alpine3.12}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 7.3/{alpine3.10 => alpine3.12}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 7.3/{alpine3.10 => alpine3.12}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 7.4/{alpine3.10 => alpine3.12}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 7.4/{alpine3.10 => alpine3.12}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 7.4/{alpine3.10 => alpine3.12}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 generate-stackbrew-library.sh | 4 ++-- update.sh | 2 +- 57 files changed, 21 insertions(+), 21 deletions(-) rename 7.2/{alpine3.10 => alpine3.12}/cli/Dockerfile (99%) rename 7.2/{alpine3.10 => alpine3.12}/cli/docker-php-entrypoint (100%) rename 7.2/{alpine3.10 => alpine3.12}/cli/docker-php-ext-configure (100%) rename 7.2/{alpine3.10 => alpine3.12}/cli/docker-php-ext-enable (100%) rename 7.2/{alpine3.10 => alpine3.12}/cli/docker-php-ext-install (100%) rename 7.2/{alpine3.10 => alpine3.12}/cli/docker-php-source (100%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/Dockerfile (99%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/docker-php-entrypoint (100%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-configure (100%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-enable (100%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-install (100%) rename 7.2/{alpine3.10 => alpine3.12}/fpm/docker-php-source (100%) rename 7.2/{alpine3.10 => alpine3.12}/zts/Dockerfile (99%) rename 7.2/{alpine3.10 => alpine3.12}/zts/docker-php-entrypoint (100%) rename 7.2/{alpine3.10 => alpine3.12}/zts/docker-php-ext-configure (100%) rename 7.2/{alpine3.10 => alpine3.12}/zts/docker-php-ext-enable (100%) rename 7.2/{alpine3.10 => alpine3.12}/zts/docker-php-ext-install (100%) rename 7.2/{alpine3.10 => alpine3.12}/zts/docker-php-source (100%) rename 7.3/{alpine3.10 => alpine3.12}/cli/Dockerfile (99%) rename 7.3/{alpine3.10 => alpine3.12}/cli/docker-php-entrypoint (100%) rename 7.3/{alpine3.10 => alpine3.12}/cli/docker-php-ext-configure (100%) rename 7.3/{alpine3.10 => alpine3.12}/cli/docker-php-ext-enable (100%) rename 7.3/{alpine3.10 => alpine3.12}/cli/docker-php-ext-install (100%) rename 7.3/{alpine3.10 => alpine3.12}/cli/docker-php-source (100%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/Dockerfile (99%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/docker-php-entrypoint (100%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-configure (100%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-enable (100%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-install (100%) rename 7.3/{alpine3.10 => alpine3.12}/fpm/docker-php-source (100%) rename 7.3/{alpine3.10 => alpine3.12}/zts/Dockerfile (99%) rename 7.3/{alpine3.10 => alpine3.12}/zts/docker-php-entrypoint (100%) rename 7.3/{alpine3.10 => alpine3.12}/zts/docker-php-ext-configure (100%) rename 7.3/{alpine3.10 => alpine3.12}/zts/docker-php-ext-enable (100%) rename 7.3/{alpine3.10 => alpine3.12}/zts/docker-php-ext-install (100%) rename 7.3/{alpine3.10 => alpine3.12}/zts/docker-php-source (100%) rename 7.4/{alpine3.10 => alpine3.12}/cli/Dockerfile (99%) rename 7.4/{alpine3.10 => alpine3.12}/cli/docker-php-entrypoint (100%) rename 7.4/{alpine3.10 => alpine3.12}/cli/docker-php-ext-configure (100%) rename 7.4/{alpine3.10 => alpine3.12}/cli/docker-php-ext-enable (100%) rename 7.4/{alpine3.10 => alpine3.12}/cli/docker-php-ext-install (100%) rename 7.4/{alpine3.10 => alpine3.12}/cli/docker-php-source (100%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/Dockerfile (99%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/docker-php-entrypoint (100%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-configure (100%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-enable (100%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/docker-php-ext-install (100%) rename 7.4/{alpine3.10 => alpine3.12}/fpm/docker-php-source (100%) rename 7.4/{alpine3.10 => alpine3.12}/zts/Dockerfile (99%) rename 7.4/{alpine3.10 => alpine3.12}/zts/docker-php-entrypoint (100%) rename 7.4/{alpine3.10 => alpine3.12}/zts/docker-php-ext-configure (100%) rename 7.4/{alpine3.10 => alpine3.12}/zts/docker-php-ext-enable (100%) rename 7.4/{alpine3.10 => alpine3.12}/zts/docker-php-ext-install (100%) rename 7.4/{alpine3.10 => alpine3.12}/zts/docker-php-source (100%) diff --git a/.travis.yml b/.travis.yml index 299d4c8a20..93b896deca 100644 --- a/.travis.yml +++ b/.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 diff --git a/7.2/alpine3.10/cli/Dockerfile b/7.2/alpine3.12/cli/Dockerfile similarity index 99% rename from 7.2/alpine3.10/cli/Dockerfile rename to 7.2/alpine3.12/cli/Dockerfile index e3dc18120c..f6cd8aa828 100644 --- a/7.2/alpine3.10/cli/Dockerfile +++ b/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) diff --git a/7.2/alpine3.10/cli/docker-php-entrypoint b/7.2/alpine3.12/cli/docker-php-entrypoint similarity index 100% rename from 7.2/alpine3.10/cli/docker-php-entrypoint rename to 7.2/alpine3.12/cli/docker-php-entrypoint diff --git a/7.2/alpine3.10/cli/docker-php-ext-configure b/7.2/alpine3.12/cli/docker-php-ext-configure similarity index 100% rename from 7.2/alpine3.10/cli/docker-php-ext-configure rename to 7.2/alpine3.12/cli/docker-php-ext-configure diff --git a/7.2/alpine3.10/cli/docker-php-ext-enable b/7.2/alpine3.12/cli/docker-php-ext-enable similarity index 100% rename from 7.2/alpine3.10/cli/docker-php-ext-enable rename to 7.2/alpine3.12/cli/docker-php-ext-enable diff --git a/7.2/alpine3.10/cli/docker-php-ext-install b/7.2/alpine3.12/cli/docker-php-ext-install similarity index 100% rename from 7.2/alpine3.10/cli/docker-php-ext-install rename to 7.2/alpine3.12/cli/docker-php-ext-install diff --git a/7.2/alpine3.10/cli/docker-php-source b/7.2/alpine3.12/cli/docker-php-source similarity index 100% rename from 7.2/alpine3.10/cli/docker-php-source rename to 7.2/alpine3.12/cli/docker-php-source diff --git a/7.2/alpine3.10/fpm/Dockerfile b/7.2/alpine3.12/fpm/Dockerfile similarity index 99% rename from 7.2/alpine3.10/fpm/Dockerfile rename to 7.2/alpine3.12/fpm/Dockerfile index 598dec04c0..fec753818e 100644 --- a/7.2/alpine3.10/fpm/Dockerfile +++ b/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) diff --git a/7.2/alpine3.10/fpm/docker-php-entrypoint b/7.2/alpine3.12/fpm/docker-php-entrypoint similarity index 100% rename from 7.2/alpine3.10/fpm/docker-php-entrypoint rename to 7.2/alpine3.12/fpm/docker-php-entrypoint diff --git a/7.2/alpine3.10/fpm/docker-php-ext-configure b/7.2/alpine3.12/fpm/docker-php-ext-configure similarity index 100% rename from 7.2/alpine3.10/fpm/docker-php-ext-configure rename to 7.2/alpine3.12/fpm/docker-php-ext-configure diff --git a/7.2/alpine3.10/fpm/docker-php-ext-enable b/7.2/alpine3.12/fpm/docker-php-ext-enable similarity index 100% rename from 7.2/alpine3.10/fpm/docker-php-ext-enable rename to 7.2/alpine3.12/fpm/docker-php-ext-enable diff --git a/7.2/alpine3.10/fpm/docker-php-ext-install b/7.2/alpine3.12/fpm/docker-php-ext-install similarity index 100% rename from 7.2/alpine3.10/fpm/docker-php-ext-install rename to 7.2/alpine3.12/fpm/docker-php-ext-install diff --git a/7.2/alpine3.10/fpm/docker-php-source b/7.2/alpine3.12/fpm/docker-php-source similarity index 100% rename from 7.2/alpine3.10/fpm/docker-php-source rename to 7.2/alpine3.12/fpm/docker-php-source diff --git a/7.2/alpine3.10/zts/Dockerfile b/7.2/alpine3.12/zts/Dockerfile similarity index 99% rename from 7.2/alpine3.10/zts/Dockerfile rename to 7.2/alpine3.12/zts/Dockerfile index 41b02c9c03..40d0838271 100644 --- a/7.2/alpine3.10/zts/Dockerfile +++ b/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) diff --git a/7.2/alpine3.10/zts/docker-php-entrypoint b/7.2/alpine3.12/zts/docker-php-entrypoint similarity index 100% rename from 7.2/alpine3.10/zts/docker-php-entrypoint rename to 7.2/alpine3.12/zts/docker-php-entrypoint diff --git a/7.2/alpine3.10/zts/docker-php-ext-configure b/7.2/alpine3.12/zts/docker-php-ext-configure similarity index 100% rename from 7.2/alpine3.10/zts/docker-php-ext-configure rename to 7.2/alpine3.12/zts/docker-php-ext-configure diff --git a/7.2/alpine3.10/zts/docker-php-ext-enable b/7.2/alpine3.12/zts/docker-php-ext-enable similarity index 100% rename from 7.2/alpine3.10/zts/docker-php-ext-enable rename to 7.2/alpine3.12/zts/docker-php-ext-enable diff --git a/7.2/alpine3.10/zts/docker-php-ext-install b/7.2/alpine3.12/zts/docker-php-ext-install similarity index 100% rename from 7.2/alpine3.10/zts/docker-php-ext-install rename to 7.2/alpine3.12/zts/docker-php-ext-install diff --git a/7.2/alpine3.10/zts/docker-php-source b/7.2/alpine3.12/zts/docker-php-source similarity index 100% rename from 7.2/alpine3.10/zts/docker-php-source rename to 7.2/alpine3.12/zts/docker-php-source diff --git a/7.3/alpine3.10/cli/Dockerfile b/7.3/alpine3.12/cli/Dockerfile similarity index 99% rename from 7.3/alpine3.10/cli/Dockerfile rename to 7.3/alpine3.12/cli/Dockerfile index 1f452aa3f7..03ca0787fd 100644 --- a/7.3/alpine3.10/cli/Dockerfile +++ b/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) diff --git a/7.3/alpine3.10/cli/docker-php-entrypoint b/7.3/alpine3.12/cli/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.10/cli/docker-php-entrypoint rename to 7.3/alpine3.12/cli/docker-php-entrypoint diff --git a/7.3/alpine3.10/cli/docker-php-ext-configure b/7.3/alpine3.12/cli/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.10/cli/docker-php-ext-configure rename to 7.3/alpine3.12/cli/docker-php-ext-configure diff --git a/7.3/alpine3.10/cli/docker-php-ext-enable b/7.3/alpine3.12/cli/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.10/cli/docker-php-ext-enable rename to 7.3/alpine3.12/cli/docker-php-ext-enable diff --git a/7.3/alpine3.10/cli/docker-php-ext-install b/7.3/alpine3.12/cli/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.10/cli/docker-php-ext-install rename to 7.3/alpine3.12/cli/docker-php-ext-install diff --git a/7.3/alpine3.10/cli/docker-php-source b/7.3/alpine3.12/cli/docker-php-source similarity index 100% rename from 7.3/alpine3.10/cli/docker-php-source rename to 7.3/alpine3.12/cli/docker-php-source diff --git a/7.3/alpine3.10/fpm/Dockerfile b/7.3/alpine3.12/fpm/Dockerfile similarity index 99% rename from 7.3/alpine3.10/fpm/Dockerfile rename to 7.3/alpine3.12/fpm/Dockerfile index 12ce0dba10..9e7c43d44e 100644 --- a/7.3/alpine3.10/fpm/Dockerfile +++ b/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) diff --git a/7.3/alpine3.10/fpm/docker-php-entrypoint b/7.3/alpine3.12/fpm/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.10/fpm/docker-php-entrypoint rename to 7.3/alpine3.12/fpm/docker-php-entrypoint diff --git a/7.3/alpine3.10/fpm/docker-php-ext-configure b/7.3/alpine3.12/fpm/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.10/fpm/docker-php-ext-configure rename to 7.3/alpine3.12/fpm/docker-php-ext-configure diff --git a/7.3/alpine3.10/fpm/docker-php-ext-enable b/7.3/alpine3.12/fpm/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.10/fpm/docker-php-ext-enable rename to 7.3/alpine3.12/fpm/docker-php-ext-enable diff --git a/7.3/alpine3.10/fpm/docker-php-ext-install b/7.3/alpine3.12/fpm/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.10/fpm/docker-php-ext-install rename to 7.3/alpine3.12/fpm/docker-php-ext-install diff --git a/7.3/alpine3.10/fpm/docker-php-source b/7.3/alpine3.12/fpm/docker-php-source similarity index 100% rename from 7.3/alpine3.10/fpm/docker-php-source rename to 7.3/alpine3.12/fpm/docker-php-source diff --git a/7.3/alpine3.10/zts/Dockerfile b/7.3/alpine3.12/zts/Dockerfile similarity index 99% rename from 7.3/alpine3.10/zts/Dockerfile rename to 7.3/alpine3.12/zts/Dockerfile index aabf79785e..bd39c450ac 100644 --- a/7.3/alpine3.10/zts/Dockerfile +++ b/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) diff --git a/7.3/alpine3.10/zts/docker-php-entrypoint b/7.3/alpine3.12/zts/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.10/zts/docker-php-entrypoint rename to 7.3/alpine3.12/zts/docker-php-entrypoint diff --git a/7.3/alpine3.10/zts/docker-php-ext-configure b/7.3/alpine3.12/zts/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.10/zts/docker-php-ext-configure rename to 7.3/alpine3.12/zts/docker-php-ext-configure diff --git a/7.3/alpine3.10/zts/docker-php-ext-enable b/7.3/alpine3.12/zts/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.10/zts/docker-php-ext-enable rename to 7.3/alpine3.12/zts/docker-php-ext-enable diff --git a/7.3/alpine3.10/zts/docker-php-ext-install b/7.3/alpine3.12/zts/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.10/zts/docker-php-ext-install rename to 7.3/alpine3.12/zts/docker-php-ext-install diff --git a/7.3/alpine3.10/zts/docker-php-source b/7.3/alpine3.12/zts/docker-php-source similarity index 100% rename from 7.3/alpine3.10/zts/docker-php-source rename to 7.3/alpine3.12/zts/docker-php-source diff --git a/7.4/alpine3.10/cli/Dockerfile b/7.4/alpine3.12/cli/Dockerfile similarity index 99% rename from 7.4/alpine3.10/cli/Dockerfile rename to 7.4/alpine3.12/cli/Dockerfile index 6ea2dae97b..3e38a73e9e 100644 --- a/7.4/alpine3.10/cli/Dockerfile +++ b/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) diff --git a/7.4/alpine3.10/cli/docker-php-entrypoint b/7.4/alpine3.12/cli/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.10/cli/docker-php-entrypoint rename to 7.4/alpine3.12/cli/docker-php-entrypoint diff --git a/7.4/alpine3.10/cli/docker-php-ext-configure b/7.4/alpine3.12/cli/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.10/cli/docker-php-ext-configure rename to 7.4/alpine3.12/cli/docker-php-ext-configure diff --git a/7.4/alpine3.10/cli/docker-php-ext-enable b/7.4/alpine3.12/cli/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.10/cli/docker-php-ext-enable rename to 7.4/alpine3.12/cli/docker-php-ext-enable diff --git a/7.4/alpine3.10/cli/docker-php-ext-install b/7.4/alpine3.12/cli/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.10/cli/docker-php-ext-install rename to 7.4/alpine3.12/cli/docker-php-ext-install diff --git a/7.4/alpine3.10/cli/docker-php-source b/7.4/alpine3.12/cli/docker-php-source similarity index 100% rename from 7.4/alpine3.10/cli/docker-php-source rename to 7.4/alpine3.12/cli/docker-php-source diff --git a/7.4/alpine3.10/fpm/Dockerfile b/7.4/alpine3.12/fpm/Dockerfile similarity index 99% rename from 7.4/alpine3.10/fpm/Dockerfile rename to 7.4/alpine3.12/fpm/Dockerfile index 26f8249b75..61a24f9861 100644 --- a/7.4/alpine3.10/fpm/Dockerfile +++ b/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) diff --git a/7.4/alpine3.10/fpm/docker-php-entrypoint b/7.4/alpine3.12/fpm/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.10/fpm/docker-php-entrypoint rename to 7.4/alpine3.12/fpm/docker-php-entrypoint diff --git a/7.4/alpine3.10/fpm/docker-php-ext-configure b/7.4/alpine3.12/fpm/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.10/fpm/docker-php-ext-configure rename to 7.4/alpine3.12/fpm/docker-php-ext-configure diff --git a/7.4/alpine3.10/fpm/docker-php-ext-enable b/7.4/alpine3.12/fpm/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.10/fpm/docker-php-ext-enable rename to 7.4/alpine3.12/fpm/docker-php-ext-enable diff --git a/7.4/alpine3.10/fpm/docker-php-ext-install b/7.4/alpine3.12/fpm/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.10/fpm/docker-php-ext-install rename to 7.4/alpine3.12/fpm/docker-php-ext-install diff --git a/7.4/alpine3.10/fpm/docker-php-source b/7.4/alpine3.12/fpm/docker-php-source similarity index 100% rename from 7.4/alpine3.10/fpm/docker-php-source rename to 7.4/alpine3.12/fpm/docker-php-source diff --git a/7.4/alpine3.10/zts/Dockerfile b/7.4/alpine3.12/zts/Dockerfile similarity index 99% rename from 7.4/alpine3.10/zts/Dockerfile rename to 7.4/alpine3.12/zts/Dockerfile index 087a2d1d23..fc56c246b3 100644 --- a/7.4/alpine3.10/zts/Dockerfile +++ b/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) diff --git a/7.4/alpine3.10/zts/docker-php-entrypoint b/7.4/alpine3.12/zts/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.10/zts/docker-php-entrypoint rename to 7.4/alpine3.12/zts/docker-php-entrypoint diff --git a/7.4/alpine3.10/zts/docker-php-ext-configure b/7.4/alpine3.12/zts/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.10/zts/docker-php-ext-configure rename to 7.4/alpine3.12/zts/docker-php-ext-configure diff --git a/7.4/alpine3.10/zts/docker-php-ext-enable b/7.4/alpine3.12/zts/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.10/zts/docker-php-ext-enable rename to 7.4/alpine3.12/zts/docker-php-ext-enable diff --git a/7.4/alpine3.10/zts/docker-php-ext-install b/7.4/alpine3.12/zts/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.10/zts/docker-php-ext-install rename to 7.4/alpine3.12/zts/docker-php-ext-install diff --git a/7.4/alpine3.10/zts/docker-php-source b/7.4/alpine3.12/zts/docker-php-source similarity index 100% rename from 7.4/alpine3.10/zts/docker-php-source rename to 7.4/alpine3.12/zts/docker-php-source diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d002398afe..5457ffc291 100755 --- a/generate-stackbrew-library.sh +++ b/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 \ diff --git a/update.sh b/update.sh index 69c56f4bb5..a5af582f55 100755 --- a/update.sh +++ b/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}"