Skip to content

Commit 55e0906

Browse files
authored
Merge pull request #910 from nick-zh/php-7.4.0
Update to php-7.4.0
2 parents 4bac7da + 76b6033 commit 55e0906

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+29
-30
lines changed

.travis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=7.4-rc VARIANT=buster/cli
6-
- VERSION=7.4-rc VARIANT=buster/apache
7-
- VERSION=7.4-rc VARIANT=buster/fpm
8-
- VERSION=7.4-rc VARIANT=buster/zts
9-
- VERSION=7.4-rc VARIANT=alpine3.10/cli
10-
- VERSION=7.4-rc VARIANT=alpine3.10/fpm
11-
- VERSION=7.4-rc VARIANT=alpine3.10/zts
5+
- VERSION=7.4 VARIANT=buster/cli
6+
- VERSION=7.4 VARIANT=buster/apache
7+
- VERSION=7.4 VARIANT=buster/fpm
8+
- VERSION=7.4 VARIANT=buster/zts
9+
- VERSION=7.4 VARIANT=alpine3.10/cli
10+
- VERSION=7.4 VARIANT=alpine3.10/fpm
11+
- VERSION=7.4 VARIANT=alpine3.10/zts
1212
- VERSION=7.3 VARIANT=buster/cli
1313
- VERSION=7.3 VARIANT=buster/apache
1414
- VERSION=7.3 VARIANT=buster/fpm

7.4-rc/alpine3.10/cli/Dockerfile renamed to 7.4/alpine3.10/cli/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6262

6363
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6464

65-
ENV PHP_VERSION 7.4.0RC6
66-
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"
67-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
65+
ENV PHP_VERSION 7.4.0
66+
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"
67+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
6868

6969
RUN set -eux; \
7070
\

7.4-rc/alpine3.10/fpm/Dockerfile renamed to 7.4/alpine3.10/fpm/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6363

6464
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6565

66-
ENV PHP_VERSION 7.4.0RC6
67-
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"
68-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
66+
ENV PHP_VERSION 7.4.0
67+
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"
68+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
6969

7070
RUN set -eux; \
7171
\

7.4-rc/alpine3.10/zts/Dockerfile renamed to 7.4/alpine3.10/zts/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6363

6464
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6565

66-
ENV PHP_VERSION 7.4.0RC6
67-
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"
68-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
66+
ENV PHP_VERSION 7.4.0
67+
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"
68+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
6969

7070
RUN set -eux; \
7171
\

7.4-rc/buster/apache/Dockerfile renamed to 7.4/buster/apache/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
124124

125125
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
126126

127-
ENV PHP_VERSION 7.4.0RC6
128-
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"
129-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
127+
ENV PHP_VERSION 7.4.0
128+
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"
129+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
130130

131131
RUN set -eux; \
132132
\

7.4-rc/buster/cli/Dockerfile renamed to 7.4/buster/cli/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6464

6565
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6666

67-
ENV PHP_VERSION 7.4.0RC6
68-
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"
69-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
67+
ENV PHP_VERSION 7.4.0
68+
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"
69+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
7070

7171
RUN set -eux; \
7272
\

7.4-rc/buster/fpm/Dockerfile renamed to 7.4/buster/fpm/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6565

6666
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6767

68-
ENV PHP_VERSION 7.4.0RC6
69-
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"
70-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
68+
ENV PHP_VERSION 7.4.0
69+
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"
70+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
7171

7272
RUN set -eux; \
7373
\

7.4-rc/buster/zts/Dockerfile renamed to 7.4/buster/zts/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
6565

6666
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6767

68-
ENV PHP_VERSION 7.4.0RC6
69-
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"
70-
ENV PHP_SHA256="6873a51f56a2c6bba192ff38e33158578c2a4380c2e2f0758949ebf55cc915a7" PHP_MD5=""
68+
ENV PHP_VERSION 7.4.0
69+
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"
70+
ENV PHP_SHA256="9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42" PHP_MD5=""
7171

7272
RUN set -eux; \
7373
\

generate-stackbrew-library.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
set -Eeuo pipefail
33

44
declare -A aliases=(
5-
[7.3]='7 latest'
6-
[7.4-rc]='rc'
5+
[7.4]='7 latest'
76
)
87

98
defaultDebianSuite='buster'

0 commit comments

Comments
 (0)