Merge pull request #454 from J0WI/php74

yosifkit · web-flow · commit 532bb60b1b78 · 2019-12-03T15:06:09.000-08:00
PHP 7.4
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,6 @@ language: bash
 services: docker
 
 env:
-  - VARIANT=php7.1/apache
-  - VARIANT=php7.1/fpm
-  - VARIANT=php7.1/fpm-alpine
-  - VARIANT=php7.1/cli
   - VARIANT=php7.2/apache
   - VARIANT=php7.2/fpm
   - VARIANT=php7.2/fpm-alpine
@@ -14,6 +10,10 @@ env:
   - VARIANT=php7.3/fpm
   - VARIANT=php7.3/fpm-alpine
   - VARIANT=php7.3/cli
+  - VARIANT=php7.4/apache
+  - VARIANT=php7.4/fpm
+  - VARIANT=php7.4/fpm-alpine
+  - VARIANT=php7.4/cli
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -21,11 +21,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template
@@ -12,11 +12,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -23,11 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile
@@ -22,11 +22,7 @@ RUN set -ex; \
 		libpng-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile
@@ -11,11 +11,7 @@ RUN set -ex; \
 		libpng-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile
@@ -20,11 +20,7 @@ RUN set -ex; \
 		libpng-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile
@@ -22,11 +22,7 @@ RUN set -ex; \
 		libpng-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile
@@ -23,11 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.3/cli/Dockerfile b/php7.3/cli/Dockerfile
@@ -12,11 +12,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile
@@ -21,11 +21,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile
@@ -23,11 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
 
 # persistent dependencies
 RUN set -eux; \
@@ -20,13 +20,10 @@ RUN set -ex; \
 		libjpeg-dev \
 		libmagickwand-dev \
 		libpng-dev \
+		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.4/apache/docker-entrypoint.sh b/php7.4/apache/docker-entrypoint.sh
diff --git a/php7.4/cli/Dockerfile b/php7.4/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-alpine
+FROM php:7.4-alpine
 
 # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions)
 RUN set -ex; \
@@ -9,13 +9,10 @@ RUN set -ex; \
 		imagemagick-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
+		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.4/cli/docker-entrypoint.sh b/php7.4/cli/docker-entrypoint.sh
diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.4-fpm-alpine
 
 # persistent dependencies
 RUN apk add --no-cache \
@@ -18,13 +18,10 @@ RUN set -ex; \
 		imagemagick-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
+		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.4/fpm-alpine/docker-entrypoint.sh b/php7.4/fpm-alpine/docker-entrypoint.sh
diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:7.4-fpm
 
 # persistent dependencies
 RUN set -eux; \
@@ -20,13 +20,10 @@ RUN set -ex; \
 		libjpeg-dev \
 		libmagickwand-dev \
 		libpng-dev \
+		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd \
-		--with-freetype-dir=/usr \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
-	; \
+	docker-php-ext-configure gd --with-freetype --with-jpeg; \
 	docker-php-ext-install -j "$(nproc)" \
 		bcmath \
 		exif \
diff --git a/php7.4/fpm/docker-entrypoint.sh b/php7.4/fpm/docker-entrypoint.sh
diff --git a/update.sh b/update.sh
@@ -74,12 +74,19 @@ for phpVersion in "${phpVersions[@]}"; do
 			"Dockerfile-${base}.template" > "$dir/Dockerfile"
 
 		case "$phpVersion" in
-			7.1 | 7.2 )
+			7.2 )
 				sed -ri \
 					-e '/libzip-dev/d' \
 					"$dir/Dockerfile"
 				;;
 		esac
+		case "$phpVersion" in
+			7.2 | 7.3 )
+				sed -ri \
+					-e 's!gd --with-freetype --with-jpeg!gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr!g' \
+					"$dir/Dockerfile"
+				;;
+		esac
 
 		cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
 
