Merge pull request #86 from J0WI/php7.4-gd

mbabker · web-flow · commit 1a7143501616 · 2019-12-03T17:50:37.000-06:00
Fix gd extension in 7.4
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile
@@ -22,7 +22,7 @@ RUN set -ex; \
 		libpq-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -38,7 +38,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
@@ -38,7 +38,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile
@@ -19,7 +19,7 @@ RUN set -ex; \
 		libpq-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -35,7 +35,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -36,7 +36,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -36,7 +36,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/update.sh b/update.sh
@@ -30,7 +30,7 @@ declare -A variantBases=(
 )
 declare -A pecl_versions=(
 	[php7-APCu]='5.1.18'
-	[php7-memcached]='3.1.4'
+	[php7-memcached]='3.1.5'
 	[php7-redis]='4.3.0'
 )
 
@@ -73,6 +73,13 @@ for phpVersion in "${phpVersions[@]}"; do
 					-e '/libzip-dev/d' \
 					"$dir/Dockerfile"
 			fi
+			case "$phpVersion" in
+				7.2 | 7.3 )
+					sed -ri \
+						-e 's!gd --with-jpeg!gd --with-jpeg-dir=/usr --with-png-dir=/usr!g' \
+						"$dir/Dockerfile"
+					;;
+			esac
 
 		)
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ RUN set -ex; \`
`24`	`24`	`postgresql-dev \`
`25`	`25`	`; \`
`26`	`26`	`\`
`27`		`- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
	`27`	`+ docker-php-ext-configure gd --with-jpeg; \`
`28`	`28`	`docker-php-ext-configure ldap; \`
`29`	`29`	`docker-php-ext-install -j "$(nproc)" \`
`30`	`30`	`bz2 \`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ RUN set -ex; \`
`20`	`20`	`libzip-dev \`
`21`	`21`	`; \`
`22`	`22`	`\`
`23`		`- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
	`23`	`+ docker-php-ext-configure gd --with-jpeg; \`
`24`	`24`	`debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \`
`25`	`25`	`docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \`
`26`	`26`	`docker-php-ext-install -j "$(nproc)" \`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ RUN set -ex; \`
`22`	`22`	`libpq-dev \`
`23`	`23`	`; \`
`24`	`24`	`\`
`25`		`- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
	`25`	`+ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \`
`26`	`26`	`debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \`
`27`	`27`	`docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \`
`28`	`28`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -38,7 +38,7 @@ RUN set -ex; \`
`38`	`38`	`\`
`39`	`39`	`# pecl will claim success even if one install fails, so we need to perform each install separately`
`40`	`40`	`pecl install APCu-5.1.18; \`
`41`		`- pecl install memcached-3.1.4; \`
	`41`	`+ pecl install memcached-3.1.5; \`
`42`	`42`	`pecl install redis-4.3.0; \`
`43`	`43`	`\`
`44`	`44`	`docker-php-ext-enable \`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ RUN set -ex; \`
`23`	`23`	`postgresql-dev \`
`24`	`24`	`; \`
`25`	`25`	`\`
`26`		`- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
	`26`	`+ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \`
`27`	`27`	`docker-php-ext-configure ldap; \`
`28`	`28`	`docker-php-ext-install -j "$(nproc)" \`
`29`	`29`	`bz2 \`
`@@ -38,7 +38,7 @@ RUN set -ex; \`
`38`	`38`	`\`
`39`	`39`	`# pecl will claim success even if one install fails, so we need to perform each install separately`
`40`	`40`	`pecl install APCu-5.1.18; \`
`41`		`- pecl install memcached-3.1.4; \`
	`41`	`+ pecl install memcached-3.1.5; \`
`42`	`42`	`pecl install redis-4.3.0; \`
`43`	`43`	`\`
`44`	`44`	`docker-php-ext-enable \`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ RUN set -ex; \`
`19`	`19`	`libpq-dev \`
`20`	`20`	`; \`
`21`	`21`	`\`
`22`		`- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
	`22`	`+ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \`
`23`	`23`	`debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \`
`24`	`24`	`docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \`
`25`	`25`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -35,7 +35,7 @@ RUN set -ex; \`
`35`	`35`	`\`
`36`	`36`	`# pecl will claim success even if one install fails, so we need to perform each install separately`
`37`	`37`	`pecl install APCu-5.1.18; \`
`38`		`- pecl install memcached-3.1.4; \`
	`38`	`+ pecl install memcached-3.1.5; \`
`39`	`39`	`pecl install redis-4.3.0; \`
`40`	`40`	`\`
`41`	`41`	`docker-php-ext-enable \`