Merge pull request #83 from J0WI/php-74

Add PHP 7.4

.travis.yml

@@ -2,15 +2,15 @@ language: bash
 services: docker
 
 env:
-  - VARIANT=php7.1/apache
-  - VARIANT=php7.1/fpm
-  - VARIANT=php7.1/fpm-alpine
   - VARIANT=php7.2/apache
   - VARIANT=php7.2/fpm
   - VARIANT=php7.2/fpm-alpine
   - VARIANT=php7.3/apache
   - VARIANT=php7.3/fpm
   - VARIANT=php7.3/fpm-alpine
+  - VARIANT=php7.4/apache
+  - VARIANT=php7.4/fpm
+  - VARIANT=php7.4/fpm-alpine
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

Dockerfile-alpine.template

@@ -16,7 +16,6 @@ RUN set -ex; \
 		autoconf \
 		bzip2-dev \
 		libjpeg-turbo-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libzip-dev \
@@ -31,7 +30,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \

Dockerfile-debian.template

@@ -14,7 +14,6 @@ RUN set -ex; \
 		libbz2-dev \
 		libjpeg-dev \
 		libldap2-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libpq-dev \
@@ -28,7 +27,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \

php7.4/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
 LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
@@ -17,10 +17,10 @@ RUN set -ex; \
 		libbz2-dev \
 		libjpeg-dev \
 		libldap2-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libpq-dev \
+		libzip-dev \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -30,7 +30,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \

php7.4/fpm-alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
@@ -16,9 +16,9 @@ RUN set -ex; \
 		autoconf \
 		bzip2-dev \
 		libjpeg-turbo-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
+		libzip-dev \
 		openldap-dev \
 		pcre-dev \
 		postgresql-dev \
@@ -30,7 +30,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \

php7.4/fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:7.4-fpm
 LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
@@ -14,10 +14,10 @@ RUN set -ex; \
 		libbz2-dev \
 		libjpeg-dev \
 		libldap2-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libpq-dev \
+		libzip-dev \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -27,7 +27,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \

update.sh

@@ -68,14 +68,7 @@ for phpVersion in "${phpVersions[@]}"; do
 			cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
 			cp -a "makedb.php" "$dir/makedb.php"
 
-			if [ $phpVersionDir = "php7.2" -o $phpVersionDir = "php7.3" ]; then
-				sed \
-					-e '/libmcrypt-dev/d' \
-					-e '/mcrypt/d' \
-					-i $dir/Dockerfile
-			fi
-
-			if [[ "$phpVersion" != 7.3 ]]; then
+			if [ "$phpVersion" = 7.2 ]; then
 				sed -ri \
 					-e '/libzip-dev/d' \
 					"$dir/Dockerfile"