Merge pull request #910 from nick-zh/php-7.4.0

Update to php-7.4.0
2025-01-22 04:51:20 +01:00 · 2019-11-28 08:39:27 -07:00 · 2019-11-28 08:39:27 -07:00 · 55e09061f5
commit 55e09061f5
parent 4bac7da6e7 76b6033de3
45 changed files with 29 additions and 30 deletions
--- 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
--- a/7.4-rc/alpine3.10/cli/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/alpine3.10/cli/docker-php-entrypoint
+++ b/7.4-rc/alpine3.10/cli/docker-php-entrypoint
--- a/7.4-rc/alpine3.10/cli/docker-php-ext-configure
+++ b/7.4-rc/alpine3.10/cli/docker-php-ext-configure
--- a/7.4-rc/alpine3.10/cli/docker-php-ext-enable
+++ b/7.4-rc/alpine3.10/cli/docker-php-ext-enable
--- a/7.4-rc/alpine3.10/cli/docker-php-ext-install
+++ b/7.4-rc/alpine3.10/cli/docker-php-ext-install
--- a/7.4-rc/alpine3.10/cli/docker-php-source
+++ b/7.4-rc/alpine3.10/cli/docker-php-source
--- a/7.4-rc/alpine3.10/fpm/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/alpine3.10/fpm/docker-php-entrypoint
+++ b/7.4-rc/alpine3.10/fpm/docker-php-entrypoint
--- a/7.4-rc/alpine3.10/fpm/docker-php-ext-configure
+++ b/7.4-rc/alpine3.10/fpm/docker-php-ext-configure
--- a/7.4-rc/alpine3.10/fpm/docker-php-ext-enable
+++ b/7.4-rc/alpine3.10/fpm/docker-php-ext-enable
--- a/7.4-rc/alpine3.10/fpm/docker-php-ext-install
+++ b/7.4-rc/alpine3.10/fpm/docker-php-ext-install
--- a/7.4-rc/alpine3.10/fpm/docker-php-source
+++ b/7.4-rc/alpine3.10/fpm/docker-php-source
--- a/7.4-rc/alpine3.10/zts/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/alpine3.10/zts/docker-php-entrypoint
+++ b/7.4-rc/alpine3.10/zts/docker-php-entrypoint
--- a/7.4-rc/alpine3.10/zts/docker-php-ext-configure
+++ b/7.4-rc/alpine3.10/zts/docker-php-ext-configure
--- a/7.4-rc/alpine3.10/zts/docker-php-ext-enable
+++ b/7.4-rc/alpine3.10/zts/docker-php-ext-enable
--- a/7.4-rc/alpine3.10/zts/docker-php-ext-install
+++ b/7.4-rc/alpine3.10/zts/docker-php-ext-install
--- a/7.4-rc/alpine3.10/zts/docker-php-source
+++ b/7.4-rc/alpine3.10/zts/docker-php-source
--- a/7.4-rc/buster/apache/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/buster/apache/apache2-foreground
+++ b/7.4-rc/buster/apache/apache2-foreground
--- a/7.4-rc/buster/apache/docker-php-entrypoint
+++ b/7.4-rc/buster/apache/docker-php-entrypoint
--- a/7.4-rc/buster/apache/docker-php-ext-configure
+++ b/7.4-rc/buster/apache/docker-php-ext-configure
--- a/7.4-rc/buster/apache/docker-php-ext-enable
+++ b/7.4-rc/buster/apache/docker-php-ext-enable
--- a/7.4-rc/buster/apache/docker-php-ext-install
+++ b/7.4-rc/buster/apache/docker-php-ext-install
--- a/7.4-rc/buster/apache/docker-php-source
+++ b/7.4-rc/buster/apache/docker-php-source
--- a/7.4-rc/buster/cli/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/buster/cli/docker-php-entrypoint
+++ b/7.4-rc/buster/cli/docker-php-entrypoint
--- a/7.4-rc/buster/cli/docker-php-ext-configure
+++ b/7.4-rc/buster/cli/docker-php-ext-configure
--- a/7.4-rc/buster/cli/docker-php-ext-enable
+++ b/7.4-rc/buster/cli/docker-php-ext-enable
--- a/7.4-rc/buster/cli/docker-php-ext-install
+++ b/7.4-rc/buster/cli/docker-php-ext-install
--- a/7.4-rc/buster/cli/docker-php-source
+++ b/7.4-rc/buster/cli/docker-php-source
--- a/7.4-rc/buster/fpm/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/buster/fpm/docker-php-entrypoint
+++ b/7.4-rc/buster/fpm/docker-php-entrypoint
--- a/7.4-rc/buster/fpm/docker-php-ext-configure
+++ b/7.4-rc/buster/fpm/docker-php-ext-configure
--- a/7.4-rc/buster/fpm/docker-php-ext-enable
+++ b/7.4-rc/buster/fpm/docker-php-ext-enable
--- a/7.4-rc/buster/fpm/docker-php-ext-install
+++ b/7.4-rc/buster/fpm/docker-php-ext-install
--- a/7.4-rc/buster/fpm/docker-php-source
+++ b/7.4-rc/buster/fpm/docker-php-source
--- a/7.4-rc/buster/zts/Dockerfile
+++ b/7.4-rc/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; \
 	\
--- a/7.4-rc/buster/zts/docker-php-entrypoint
+++ b/7.4-rc/buster/zts/docker-php-entrypoint
--- a/7.4-rc/buster/zts/docker-php-ext-configure
+++ b/7.4-rc/buster/zts/docker-php-ext-configure
--- a/7.4-rc/buster/zts/docker-php-ext-enable
+++ b/7.4-rc/buster/zts/docker-php-ext-enable
--- a/7.4-rc/buster/zts/docker-php-ext-install
+++ b/7.4-rc/buster/zts/docker-php-ext-install
--- a/7.4-rc/buster/zts/docker-php-source
+++ b/7.4-rc/buster/zts/docker-php-source
--- 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'