Skip to content

Commit d7d816d

Browse files
vlastvvlastv
committed
Rebase from master
1 parent 85d19fc commit d7d816d

File tree

16 files changed

+61
-99
lines changed

16 files changed

+61
-99
lines changed

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
- VERSION=7.4 VARIANT=alpine3.11/fpm
1212
- VERSION=7.4 VARIANT=alpine3.11/zts
1313
- VERSION=7.4 VARIANT=alpine3.11/sapi
14-
- VERSION=7.4 VARIANT=alpine3.11/unit
1514
- VERSION=7.4 VARIANT=alpine3.10/cli
1615
- VERSION=7.4 VARIANT=alpine3.10/fpm
1716
- VERSION=7.4 VARIANT=alpine3.10/zts

‎7.2/alpine3.10/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

66-
ENV PHP_VERSION 7.2.27
67-
ENV PHP_URL="https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror"
68-
ENV PHP_SHA256="7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32" PHP_MD5=""
65+
ENV PHP_VERSION 7.2.31
66+
ENV PHP_URL="https://www.php.net/distributions/php-7.2.31.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.2.31.tar.xz.asc"
67+
ENV PHP_SHA256="8beaa634bb878a96af9bc8643811ea46973f5f41ad2bfb6ab4cfd290e5a39806" PHP_MD5=""
6968

7069
RUN set -eux; \
7170
\
@@ -123,7 +122,7 @@ RUN set -eux; \
123122
--with-config-file-path="$PHP_INI_DIR" \
124123
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
125124
\
126-
# make sure invalid --configure-flags are fatal errors intead of just warnings
125+
# make sure invalid --configure-flags are fatal errors instead of just warnings
127126
--enable-option-checking=fatal \
128127
\
129128
# https://github.com/docker-library/php/issues/439

‎7.2/alpine3.11/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

66-
ENV PHP_VERSION 7.2.27
67-
ENV PHP_URL="https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror"
68-
ENV PHP_SHA256="7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32" PHP_MD5=""
65+
ENV PHP_VERSION 7.2.31
66+
ENV PHP_URL="https://www.php.net/distributions/php-7.2.31.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.2.31.tar.xz.asc"
67+
ENV PHP_SHA256="8beaa634bb878a96af9bc8643811ea46973f5f41ad2bfb6ab4cfd290e5a39806" PHP_MD5=""
6968

7069
RUN set -eux; \
7170
\
@@ -123,7 +122,7 @@ RUN set -eux; \
123122
--with-config-file-path="$PHP_INI_DIR" \
124123
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
125124
\
126-
# make sure invalid --configure-flags are fatal errors intead of just warnings
125+
# make sure invalid --configure-flags are fatal errors instead of just warnings
127126
--enable-option-checking=fatal \
128127
\
129128
# https://github.com/docker-library/php/issues/439

‎7.2/buster/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6766

68-
ENV PHP_VERSION 7.2.27
69-
ENV PHP_URL="https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror"
70-
ENV PHP_SHA256="7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32" PHP_MD5=""
67+
ENV PHP_VERSION 7.2.31
68+
ENV PHP_URL="https://www.php.net/distributions/php-7.2.31.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.2.31.tar.xz.asc"
69+
ENV PHP_SHA256="8beaa634bb878a96af9bc8643811ea46973f5f41ad2bfb6ab4cfd290e5a39806" PHP_MD5=""
7170

7271
RUN set -eux; \
7372
\
@@ -140,7 +139,7 @@ RUN set -eux; \
140139
--with-config-file-path="$PHP_INI_DIR" \
141140
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
142141
\
143-
# make sure invalid --configure-flags are fatal errors intead of just warnings
142+
# make sure invalid --configure-flags are fatal errors instead of just warnings
144143
--enable-option-checking=fatal \
145144
\
146145
# https://github.com/docker-library/php/issues/439

‎7.2/stretch/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6766

68-
ENV PHP_VERSION 7.2.27
69-
ENV PHP_URL="https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror"
70-
ENV PHP_SHA256="7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32" PHP_MD5=""
67+
ENV PHP_VERSION 7.2.31
68+
ENV PHP_URL="https://www.php.net/distributions/php-7.2.31.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.2.31.tar.xz.asc"
69+
ENV PHP_SHA256="8beaa634bb878a96af9bc8643811ea46973f5f41ad2bfb6ab4cfd290e5a39806" PHP_MD5=""
7170

7271
RUN set -eux; \
7372
\
@@ -152,7 +151,7 @@ RUN set -eux; \
152151
--with-config-file-path="$PHP_INI_DIR" \
153152
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
154153
\
155-
# make sure invalid --configure-flags are fatal errors intead of just warnings
154+
# make sure invalid --configure-flags are fatal errors instead of just warnings
156155
--enable-option-checking=fatal \
157156
\
158157
# https://github.com/docker-library/php/issues/439

‎7.3/alpine3.10/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
6564

66-
ENV PHP_VERSION 7.3.14
67-
ENV PHP_URL="https://www.php.net/get/php-7.3.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.3.14.tar.xz.asc/from/this/mirror"
68-
ENV PHP_SHA256="cc05dd373ca5d36652800762f65c10e828a17de35aaf246262e3efa99d00cdb0" PHP_MD5=""
65+
ENV PHP_VERSION 7.3.18
66+
ENV PHP_URL="https://www.php.net/distributions/php-7.3.18.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.3.18.tar.xz.asc"
67+
ENV PHP_SHA256="7b3e2479a8d6fd7666dcdef8aec50d49c4599cc6ee86e48d41724cfd99cc9e58" PHP_MD5=""
6968

7069
RUN set -eux; \
7170
\
@@ -123,7 +122,7 @@ RUN set -eux; \
123122
--with-config-file-path="$PHP_INI_DIR" \
124123
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
125124
\
126-
# make sure invalid --configure-flags are fatal errors intead of just warnings
125+
# make sure invalid --configure-flags are fatal errors instead of just warnings
127126
--enable-option-checking=fatal \
128127
\
129128
# https://github.com/docker-library/php/issues/439

‎7.3/alpine3.11/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
6564

66-
ENV PHP_VERSION 7.3.14
67-
ENV PHP_URL="https://www.php.net/get/php-7.3.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.3.14.tar.xz.asc/from/this/mirror"
68-
ENV PHP_SHA256="cc05dd373ca5d36652800762f65c10e828a17de35aaf246262e3efa99d00cdb0" PHP_MD5=""
65+
ENV PHP_VERSION 7.3.18
66+
ENV PHP_URL="https://www.php.net/distributions/php-7.3.18.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.3.18.tar.xz.asc"
67+
ENV PHP_SHA256="7b3e2479a8d6fd7666dcdef8aec50d49c4599cc6ee86e48d41724cfd99cc9e58" PHP_MD5=""
6968

7069
RUN set -eux; \
7170
\
@@ -123,7 +122,7 @@ RUN set -eux; \
123122
--with-config-file-path="$PHP_INI_DIR" \
124123
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
125124
\
126-
# make sure invalid --configure-flags are fatal errors intead of just warnings
125+
# make sure invalid --configure-flags are fatal errors instead of just warnings
127126
--enable-option-checking=fatal \
128127
\
129128
# https://github.com/docker-library/php/issues/439

‎7.3/buster/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
6766

68-
ENV PHP_VERSION 7.3.14
69-
ENV PHP_URL="https://www.php.net/get/php-7.3.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.3.14.tar.xz.asc/from/this/mirror"
70-
ENV PHP_SHA256="cc05dd373ca5d36652800762f65c10e828a17de35aaf246262e3efa99d00cdb0" PHP_MD5=""
67+
ENV PHP_VERSION 7.3.18
68+
ENV PHP_URL="https://www.php.net/distributions/php-7.3.18.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.3.18.tar.xz.asc"
69+
ENV PHP_SHA256="7b3e2479a8d6fd7666dcdef8aec50d49c4599cc6ee86e48d41724cfd99cc9e58" PHP_MD5=""
7170

7271
RUN set -eux; \
7372
\
@@ -140,7 +139,7 @@ RUN set -eux; \
140139
--with-config-file-path="$PHP_INI_DIR" \
141140
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
142141
\
143-
# make sure invalid --configure-flags are fatal errors intead of just warnings
142+
# make sure invalid --configure-flags are fatal errors instead of just warnings
144143
--enable-option-checking=fatal \
145144
\
146145
# https://github.com/docker-library/php/issues/439

‎7.3/stretch/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
6766

68-
ENV PHP_VERSION 7.3.14
69-
ENV PHP_URL="https://www.php.net/get/php-7.3.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.3.14.tar.xz.asc/from/this/mirror"
70-
ENV PHP_SHA256="cc05dd373ca5d36652800762f65c10e828a17de35aaf246262e3efa99d00cdb0" PHP_MD5=""
67+
ENV PHP_VERSION 7.3.18
68+
ENV PHP_URL="https://www.php.net/distributions/php-7.3.18.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.3.18.tar.xz.asc"
69+
ENV PHP_SHA256="7b3e2479a8d6fd7666dcdef8aec50d49c4599cc6ee86e48d41724cfd99cc9e58" PHP_MD5=""
7170

7271
RUN set -eux; \
7372
\
@@ -152,7 +151,7 @@ RUN set -eux; \
152151
--with-config-file-path="$PHP_INI_DIR" \
153152
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
154153
\
155-
# make sure invalid --configure-flags are fatal errors intead of just warnings
154+
# make sure invalid --configure-flags are fatal errors instead of just warnings
156155
--enable-option-checking=fatal \
157156
\
158157
# https://github.com/docker-library/php/issues/439

‎7.4/alpine3.10/sapi/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 42670A7FE4D0441C8E4632349E4FDC074A4EF02D 5A52880781F755608BF815FC910DEB46F53EA312
6564

66-
ENV PHP_VERSION 7.4.2
67-
ENV PHP_URL="https://www.php.net/get/php-7.4.2.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-7.4.2.tar.xz.asc/from/this/mirror"
68-
ENV PHP_SHA256="98284deac017da0d426117ecae7599a1f1bf62ae3911e8bc16c4403a8f4bdf13" PHP_MD5=""
65+
ENV PHP_VERSION 7.4.6
66+
ENV PHP_URL="https://www.php.net/distributions/php-7.4.6.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-7.4.6.tar.xz.asc"
67+
ENV PHP_SHA256="d740322f84f63019622b9f369d64ea5ab676547d2bdcf12be77a5a4cffd06832" PHP_MD5=""
6968

7069
RUN set -eux; \
7170
\
@@ -125,7 +124,7 @@ RUN set -eux; \
125124
--with-config-file-path="$PHP_INI_DIR" \
126125
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
127126
\
128-
# make sure invalid --configure-flags are fatal errors intead of just warnings
127+
# make sure invalid --configure-flags are fatal errors instead of just warnings
129128
--enable-option-checking=fatal \
130129
\
131130
# https://github.com/docker-library/php/issues/439

0 commit comments

Comments
 (0)