From e186b9bb7ac9fdf0c07adfcad6dadf9cae6495ad Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 28 Nov 2019 08:25:42 +0100 Subject: [PATCH 1/2] update to php-7.4.0 --- .travis.yml | 14 +++++++------- {7.4-rc => 7.4}/alpine3.10/cli/Dockerfile | 6 +++--- .../alpine3.10/cli/docker-php-entrypoint | 0 .../alpine3.10/cli/docker-php-ext-configure | 0 .../alpine3.10/cli/docker-php-ext-enable | 0 .../alpine3.10/cli/docker-php-ext-install | 0 {7.4-rc => 7.4}/alpine3.10/cli/docker-php-source | 0 {7.4-rc => 7.4}/alpine3.10/fpm/Dockerfile | 6 +++--- .../alpine3.10/fpm/docker-php-entrypoint | 0 .../alpine3.10/fpm/docker-php-ext-configure | 0 .../alpine3.10/fpm/docker-php-ext-enable | 0 .../alpine3.10/fpm/docker-php-ext-install | 0 {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-source | 0 {7.4-rc => 7.4}/alpine3.10/zts/Dockerfile | 6 +++--- .../alpine3.10/zts/docker-php-entrypoint | 0 .../alpine3.10/zts/docker-php-ext-configure | 0 .../alpine3.10/zts/docker-php-ext-enable | 0 .../alpine3.10/zts/docker-php-ext-install | 0 {7.4-rc => 7.4}/alpine3.10/zts/docker-php-source | 0 {7.4-rc => 7.4}/buster/apache/Dockerfile | 6 +++--- {7.4-rc => 7.4}/buster/apache/apache2-foreground | 0 .../buster/apache/docker-php-entrypoint | 0 .../buster/apache/docker-php-ext-configure | 0 .../buster/apache/docker-php-ext-enable | 0 .../buster/apache/docker-php-ext-install | 0 {7.4-rc => 7.4}/buster/apache/docker-php-source | 0 {7.4-rc => 7.4}/buster/cli/Dockerfile | 6 +++--- {7.4-rc => 7.4}/buster/cli/docker-php-entrypoint | 0 .../buster/cli/docker-php-ext-configure | 0 {7.4-rc => 7.4}/buster/cli/docker-php-ext-enable | 0 {7.4-rc => 7.4}/buster/cli/docker-php-ext-install | 0 {7.4-rc => 7.4}/buster/cli/docker-php-source | 0 {7.4-rc => 7.4}/buster/fpm/Dockerfile | 6 +++--- {7.4-rc => 7.4}/buster/fpm/docker-php-entrypoint | 0 .../buster/fpm/docker-php-ext-configure | 0 {7.4-rc => 7.4}/buster/fpm/docker-php-ext-enable | 0 {7.4-rc => 7.4}/buster/fpm/docker-php-ext-install | 0 {7.4-rc => 7.4}/buster/fpm/docker-php-source | 0 {7.4-rc => 7.4}/buster/zts/Dockerfile | 6 +++--- {7.4-rc => 7.4}/buster/zts/docker-php-entrypoint | 0 .../buster/zts/docker-php-ext-configure | 0 {7.4-rc => 7.4}/buster/zts/docker-php-ext-enable | 0 {7.4-rc => 7.4}/buster/zts/docker-php-ext-install | 0 {7.4-rc => 7.4}/buster/zts/docker-php-source | 0 44 files changed, 28 insertions(+), 28 deletions(-) rename {7.4-rc => 7.4}/alpine3.10/cli/Dockerfile (95%) rename {7.4-rc => 7.4}/alpine3.10/cli/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/alpine3.10/cli/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/alpine3.10/cli/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/alpine3.10/cli/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/alpine3.10/cli/docker-php-source (100%) rename {7.4-rc => 7.4}/alpine3.10/fpm/Dockerfile (96%) rename {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/alpine3.10/fpm/docker-php-source (100%) rename {7.4-rc => 7.4}/alpine3.10/zts/Dockerfile (96%) rename {7.4-rc => 7.4}/alpine3.10/zts/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/alpine3.10/zts/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/alpine3.10/zts/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/alpine3.10/zts/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/alpine3.10/zts/docker-php-source (100%) rename {7.4-rc => 7.4}/buster/apache/Dockerfile (97%) rename {7.4-rc => 7.4}/buster/apache/apache2-foreground (100%) rename {7.4-rc => 7.4}/buster/apache/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/buster/apache/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/buster/apache/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/buster/apache/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/buster/apache/docker-php-source (100%) rename {7.4-rc => 7.4}/buster/cli/Dockerfile (96%) rename {7.4-rc => 7.4}/buster/cli/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/buster/cli/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/buster/cli/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/buster/cli/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/buster/cli/docker-php-source (100%) rename {7.4-rc => 7.4}/buster/fpm/Dockerfile (96%) rename {7.4-rc => 7.4}/buster/fpm/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/buster/fpm/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/buster/fpm/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/buster/fpm/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/buster/fpm/docker-php-source (100%) rename {7.4-rc => 7.4}/buster/zts/Dockerfile (96%) rename {7.4-rc => 7.4}/buster/zts/docker-php-entrypoint (100%) rename {7.4-rc => 7.4}/buster/zts/docker-php-ext-configure (100%) rename {7.4-rc => 7.4}/buster/zts/docker-php-ext-enable (100%) rename {7.4-rc => 7.4}/buster/zts/docker-php-ext-install (100%) rename {7.4-rc => 7.4}/buster/zts/docker-php-source (100%) diff --git a/.travis.yml b/.travis.yml index bc79bc7e15..7c282ba996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,13 @@ language: bash services: docker env: - - VERSION=7.4-rc VARIANT=buster/cli - - VERSION=7.4-rc VARIANT=buster/apache - - VERSION=7.4-rc VARIANT=buster/fpm - - VERSION=7.4-rc VARIANT=buster/zts - - VERSION=7.4-rc VARIANT=alpine3.10/cli - - VERSION=7.4-rc VARIANT=alpine3.10/fpm - - VERSION=7.4-rc VARIANT=alpine3.10/zts + - VERSION=7.4 VARIANT=buster/cli + - VERSION=7.4 VARIANT=buster/apache + - VERSION=7.4 VARIANT=buster/fpm + - VERSION=7.4 VARIANT=buster/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 diff --git a/7.4-rc/alpine3.10/cli/Dockerfile b/7.4/alpine3.10/cli/Dockerfile similarity index 95% rename from 7.4-rc/alpine3.10/cli/Dockerfile rename to 7.4/alpine3.10/cli/Dockerfile index 10697d9669..940bfd59cb 100644 --- a/7.4-rc/alpine3.10/cli/Dockerfile +++ b/7.4/alpine3.10/cli/Dockerfile @@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/alpine3.10/cli/docker-php-entrypoint b/7.4/alpine3.10/cli/docker-php-entrypoint similarity index 100% rename from 7.4-rc/alpine3.10/cli/docker-php-entrypoint rename to 7.4/alpine3.10/cli/docker-php-entrypoint diff --git a/7.4-rc/alpine3.10/cli/docker-php-ext-configure b/7.4/alpine3.10/cli/docker-php-ext-configure similarity index 100% rename from 7.4-rc/alpine3.10/cli/docker-php-ext-configure rename to 7.4/alpine3.10/cli/docker-php-ext-configure diff --git a/7.4-rc/alpine3.10/cli/docker-php-ext-enable b/7.4/alpine3.10/cli/docker-php-ext-enable similarity index 100% rename from 7.4-rc/alpine3.10/cli/docker-php-ext-enable rename to 7.4/alpine3.10/cli/docker-php-ext-enable diff --git a/7.4-rc/alpine3.10/cli/docker-php-ext-install b/7.4/alpine3.10/cli/docker-php-ext-install similarity index 100% rename from 7.4-rc/alpine3.10/cli/docker-php-ext-install rename to 7.4/alpine3.10/cli/docker-php-ext-install diff --git a/7.4-rc/alpine3.10/cli/docker-php-source b/7.4/alpine3.10/cli/docker-php-source similarity index 100% rename from 7.4-rc/alpine3.10/cli/docker-php-source rename to 7.4/alpine3.10/cli/docker-php-source diff --git a/7.4-rc/alpine3.10/fpm/Dockerfile b/7.4/alpine3.10/fpm/Dockerfile similarity index 96% rename from 7.4-rc/alpine3.10/fpm/Dockerfile rename to 7.4/alpine3.10/fpm/Dockerfile index 65e3b4f233..fbce421c40 100644 --- a/7.4-rc/alpine3.10/fpm/Dockerfile +++ b/7.4/alpine3.10/fpm/Dockerfile @@ -63,9 +63,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/alpine3.10/fpm/docker-php-entrypoint b/7.4/alpine3.10/fpm/docker-php-entrypoint similarity index 100% rename from 7.4-rc/alpine3.10/fpm/docker-php-entrypoint rename to 7.4/alpine3.10/fpm/docker-php-entrypoint diff --git a/7.4-rc/alpine3.10/fpm/docker-php-ext-configure b/7.4/alpine3.10/fpm/docker-php-ext-configure similarity index 100% rename from 7.4-rc/alpine3.10/fpm/docker-php-ext-configure rename to 7.4/alpine3.10/fpm/docker-php-ext-configure diff --git a/7.4-rc/alpine3.10/fpm/docker-php-ext-enable b/7.4/alpine3.10/fpm/docker-php-ext-enable similarity index 100% rename from 7.4-rc/alpine3.10/fpm/docker-php-ext-enable rename to 7.4/alpine3.10/fpm/docker-php-ext-enable diff --git a/7.4-rc/alpine3.10/fpm/docker-php-ext-install b/7.4/alpine3.10/fpm/docker-php-ext-install similarity index 100% rename from 7.4-rc/alpine3.10/fpm/docker-php-ext-install rename to 7.4/alpine3.10/fpm/docker-php-ext-install diff --git a/7.4-rc/alpine3.10/fpm/docker-php-source b/7.4/alpine3.10/fpm/docker-php-source similarity index 100% rename from 7.4-rc/alpine3.10/fpm/docker-php-source rename to 7.4/alpine3.10/fpm/docker-php-source diff --git a/7.4-rc/alpine3.10/zts/Dockerfile b/7.4/alpine3.10/zts/Dockerfile similarity index 96% rename from 7.4-rc/alpine3.10/zts/Dockerfile rename to 7.4/alpine3.10/zts/Dockerfile index 33dc1b10ee..0e747bda93 100644 --- a/7.4-rc/alpine3.10/zts/Dockerfile +++ b/7.4/alpine3.10/zts/Dockerfile @@ -63,9 +63,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/alpine3.10/zts/docker-php-entrypoint b/7.4/alpine3.10/zts/docker-php-entrypoint similarity index 100% rename from 7.4-rc/alpine3.10/zts/docker-php-entrypoint rename to 7.4/alpine3.10/zts/docker-php-entrypoint diff --git a/7.4-rc/alpine3.10/zts/docker-php-ext-configure b/7.4/alpine3.10/zts/docker-php-ext-configure similarity index 100% rename from 7.4-rc/alpine3.10/zts/docker-php-ext-configure rename to 7.4/alpine3.10/zts/docker-php-ext-configure diff --git a/7.4-rc/alpine3.10/zts/docker-php-ext-enable b/7.4/alpine3.10/zts/docker-php-ext-enable similarity index 100% rename from 7.4-rc/alpine3.10/zts/docker-php-ext-enable rename to 7.4/alpine3.10/zts/docker-php-ext-enable diff --git a/7.4-rc/alpine3.10/zts/docker-php-ext-install b/7.4/alpine3.10/zts/docker-php-ext-install similarity index 100% rename from 7.4-rc/alpine3.10/zts/docker-php-ext-install rename to 7.4/alpine3.10/zts/docker-php-ext-install diff --git a/7.4-rc/alpine3.10/zts/docker-php-source b/7.4/alpine3.10/zts/docker-php-source similarity index 100% rename from 7.4-rc/alpine3.10/zts/docker-php-source rename to 7.4/alpine3.10/zts/docker-php-source diff --git a/7.4-rc/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile similarity index 97% rename from 7.4-rc/buster/apache/Dockerfile rename to 7.4/buster/apache/Dockerfile index 5ad1fd7a02..c155a938ad 100644 --- a/7.4-rc/buster/apache/Dockerfile +++ b/7.4/buster/apache/Dockerfile @@ -124,9 +124,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/buster/apache/apache2-foreground b/7.4/buster/apache/apache2-foreground similarity index 100% rename from 7.4-rc/buster/apache/apache2-foreground rename to 7.4/buster/apache/apache2-foreground diff --git a/7.4-rc/buster/apache/docker-php-entrypoint b/7.4/buster/apache/docker-php-entrypoint similarity index 100% rename from 7.4-rc/buster/apache/docker-php-entrypoint rename to 7.4/buster/apache/docker-php-entrypoint diff --git a/7.4-rc/buster/apache/docker-php-ext-configure b/7.4/buster/apache/docker-php-ext-configure similarity index 100% rename from 7.4-rc/buster/apache/docker-php-ext-configure rename to 7.4/buster/apache/docker-php-ext-configure diff --git a/7.4-rc/buster/apache/docker-php-ext-enable b/7.4/buster/apache/docker-php-ext-enable similarity index 100% rename from 7.4-rc/buster/apache/docker-php-ext-enable rename to 7.4/buster/apache/docker-php-ext-enable diff --git a/7.4-rc/buster/apache/docker-php-ext-install b/7.4/buster/apache/docker-php-ext-install similarity index 100% rename from 7.4-rc/buster/apache/docker-php-ext-install rename to 7.4/buster/apache/docker-php-ext-install diff --git a/7.4-rc/buster/apache/docker-php-source b/7.4/buster/apache/docker-php-source similarity index 100% rename from 7.4-rc/buster/apache/docker-php-source rename to 7.4/buster/apache/docker-php-source diff --git a/7.4-rc/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile similarity index 96% rename from 7.4-rc/buster/cli/Dockerfile rename to 7.4/buster/cli/Dockerfile index dd6f1f3b47..9b6df0bfd6 100644 --- a/7.4-rc/buster/cli/Dockerfile +++ b/7.4/buster/cli/Dockerfile @@ -64,9 +64,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/buster/cli/docker-php-entrypoint b/7.4/buster/cli/docker-php-entrypoint similarity index 100% rename from 7.4-rc/buster/cli/docker-php-entrypoint rename to 7.4/buster/cli/docker-php-entrypoint diff --git a/7.4-rc/buster/cli/docker-php-ext-configure b/7.4/buster/cli/docker-php-ext-configure similarity index 100% rename from 7.4-rc/buster/cli/docker-php-ext-configure rename to 7.4/buster/cli/docker-php-ext-configure diff --git a/7.4-rc/buster/cli/docker-php-ext-enable b/7.4/buster/cli/docker-php-ext-enable similarity index 100% rename from 7.4-rc/buster/cli/docker-php-ext-enable rename to 7.4/buster/cli/docker-php-ext-enable diff --git a/7.4-rc/buster/cli/docker-php-ext-install b/7.4/buster/cli/docker-php-ext-install similarity index 100% rename from 7.4-rc/buster/cli/docker-php-ext-install rename to 7.4/buster/cli/docker-php-ext-install diff --git a/7.4-rc/buster/cli/docker-php-source b/7.4/buster/cli/docker-php-source similarity index 100% rename from 7.4-rc/buster/cli/docker-php-source rename to 7.4/buster/cli/docker-php-source diff --git a/7.4-rc/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile similarity index 96% rename from 7.4-rc/buster/fpm/Dockerfile rename to 7.4/buster/fpm/Dockerfile index 1dce095dea..8015e2437f 100644 --- a/7.4-rc/buster/fpm/Dockerfile +++ b/7.4/buster/fpm/Dockerfile @@ -65,9 +65,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/buster/fpm/docker-php-entrypoint b/7.4/buster/fpm/docker-php-entrypoint similarity index 100% rename from 7.4-rc/buster/fpm/docker-php-entrypoint rename to 7.4/buster/fpm/docker-php-entrypoint diff --git a/7.4-rc/buster/fpm/docker-php-ext-configure b/7.4/buster/fpm/docker-php-ext-configure similarity index 100% rename from 7.4-rc/buster/fpm/docker-php-ext-configure rename to 7.4/buster/fpm/docker-php-ext-configure diff --git a/7.4-rc/buster/fpm/docker-php-ext-enable b/7.4/buster/fpm/docker-php-ext-enable similarity index 100% rename from 7.4-rc/buster/fpm/docker-php-ext-enable rename to 7.4/buster/fpm/docker-php-ext-enable diff --git a/7.4-rc/buster/fpm/docker-php-ext-install b/7.4/buster/fpm/docker-php-ext-install similarity index 100% rename from 7.4-rc/buster/fpm/docker-php-ext-install rename to 7.4/buster/fpm/docker-php-ext-install diff --git a/7.4-rc/buster/fpm/docker-php-source b/7.4/buster/fpm/docker-php-source similarity index 100% rename from 7.4-rc/buster/fpm/docker-php-source rename to 7.4/buster/fpm/docker-php-source diff --git a/7.4-rc/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile similarity index 96% rename from 7.4-rc/buster/zts/Dockerfile rename to 7.4/buster/zts/Dockerfile index c89abcc37b..1e57aa5705 100644 --- a/7.4-rc/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -65,9 +65,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312 -ENV PHP_VERSION 7.4.0RC6 -ENV PHP_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~derick/php-7.4.0RC6.tar.xz.asc" -ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5="" +ENV PHP_VERSION 7.4.0 +ENV PHP_URL="https://secure.php.net/get/php-7.4.0.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.4.0.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5="" RUN set -eux; \ \ diff --git a/7.4-rc/buster/zts/docker-php-entrypoint b/7.4/buster/zts/docker-php-entrypoint similarity index 100% rename from 7.4-rc/buster/zts/docker-php-entrypoint rename to 7.4/buster/zts/docker-php-entrypoint diff --git a/7.4-rc/buster/zts/docker-php-ext-configure b/7.4/buster/zts/docker-php-ext-configure similarity index 100% rename from 7.4-rc/buster/zts/docker-php-ext-configure rename to 7.4/buster/zts/docker-php-ext-configure diff --git a/7.4-rc/buster/zts/docker-php-ext-enable b/7.4/buster/zts/docker-php-ext-enable similarity index 100% rename from 7.4-rc/buster/zts/docker-php-ext-enable rename to 7.4/buster/zts/docker-php-ext-enable diff --git a/7.4-rc/buster/zts/docker-php-ext-install b/7.4/buster/zts/docker-php-ext-install similarity index 100% rename from 7.4-rc/buster/zts/docker-php-ext-install rename to 7.4/buster/zts/docker-php-ext-install diff --git a/7.4-rc/buster/zts/docker-php-source b/7.4/buster/zts/docker-php-source similarity index 100% rename from 7.4-rc/buster/zts/docker-php-source rename to 7.4/buster/zts/docker-php-source From 76b6033de31250d89db312047f1f82d26510559e Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 28 Nov 2019 08:58:17 +0100 Subject: [PATCH 2/2] adjust aliases --- generate-stackbrew-library.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c6b7e9b8f8..a1233bb411 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [7.3]='7 latest' - [7.4-rc]='rc' + [7.4]='7 latest' ) defaultDebianSuite='buster'