Merge pull request #71 from J0WI/rotate-php73

Replace PHP 7.0 by PHP 7.3

.travis.yml

@@ -5,15 +5,15 @@ env:
   - VARIANT=php5.6/apache
   - VARIANT=php5.6/fpm
   - VARIANT=php5.6/fpm-alpine
-  - VARIANT=php7.0/apache
-  - VARIANT=php7.0/fpm
-  - VARIANT=php7.0/fpm-alpine
   - 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
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

Dockerfile-alpine.template

@@ -19,6 +19,7 @@ RUN set -ex; \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
+		libzip-dev \
 		openldap-dev \
 		pcre-dev \
 		postgresql-dev \

Dockerfile-debian.template

@@ -18,6 +18,7 @@ RUN set -ex; \
 		libmemcached-dev \
 		libpng-dev \
 		libpq-dev \
+		libzip-dev \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \

php7.1/apache/Dockerfile

@@ -39,8 +39,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.1/fpm-alpine/Dockerfile

@@ -39,8 +39,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.1/fpm/Dockerfile

@@ -36,8 +36,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.2/apache/Dockerfile

@@ -37,8 +37,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.2/fpm-alpine/Dockerfile

@@ -37,8 +37,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.2/fpm/Dockerfile

@@ -34,8 +34,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.3/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.0-apache
+FROM php:7.3-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 \
@@ -39,8 +38,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.3/fpm-alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.0-fpm-alpine
+FROM php:7.3-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 \
@@ -39,8 +38,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

php7.3/fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.0-fpm
+FROM php:7.3-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 \
@@ -36,8 +35,8 @@ 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.13; \
-	pecl install memcached-3.0.4; \
+	pecl install APCu-5.1.16; \
+	pecl install memcached-3.1.2; \
 	pecl install redis-4.2.0; \
 	\
 	docker-php-ext-enable \

update.sh

@@ -32,8 +32,8 @@ declare -A pecl_versions=(
 	[php5-APCu]='4.0.11'
 	[php5-memcached]='2.2.0'
 	[php5-redis]='4.2.0'
-	[php7-APCu]='5.1.13'
-	[php7-memcached]='3.0.4'
+	[php7-APCu]='5.1.16'
+	[php7-memcached]='3.1.2'
 	[php7-redis]='4.2.0'
 )
 
@@ -71,12 +71,19 @@ for phpVersion in "${phpVersions[@]}"; do
 			cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
 			cp -a "makedb.php" "$dir/makedb.php"
 
-			if [ $phpVersionDir = "php7.2" ]; then
+			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
+				sed -ri \
+					-e '/libzip-dev/d' \
+					"$dir/Dockerfile"
+			fi
+
 		)
 
 		travisEnv+='\n  - VARIANT='"$dir"