Add "--disable-hash" (so it can be compiled after-the-fact)

tianon · tianon · commit b6c589131a94 · 2018-04-19T14:15:39.000-07:00
This allows for users of the image to `docker-php-ext-configure hash --with-mhash`, for example.
diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.4/cli/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.4/zts/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.4/cli/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.4/zts/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.4/cli/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.4/zts/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile
@@ -116,6 +116,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile
@@ -116,6 +116,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile
@@ -115,6 +115,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile
@@ -116,6 +116,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile
@@ -116,6 +116,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -109,6 +109,9 @@ RUN set -xe \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -130,6 +130,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--disable-hash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,9 @@ RUN set -xe \`
`114`	`114`	`\`
`115`	`115`	`--disable-cgi \`
`116`	`116`	`\`
	`117`	`+# https://github.com/docker-library/php/issues/439`
	`118`	`+ --disable-hash \`
	`119`	`+ \`
`117`	`120`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`118`	`121`	`--enable-ftp \`
`119`	`122`	`# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@ RUN set -xe \`
`115`	`115`	`\`
`116`	`116`	`--disable-cgi \`
`117`	`117`	`\`
	`118`	`+# https://github.com/docker-library/php/issues/439`
	`119`	`+ --disable-hash \`
	`120`	`+ \`
`118`	`121`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`119`	`122`	`--enable-ftp \`
`120`	`123`	`# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)`