Merge pull request #73 from devilbox/release-0.56

WIP: Use latest stable PHP 7.3 base image

Author: cytopia

Dockerfiles/base/Dockerfile-7.3

@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM php:7.3-rc-fpm
+FROM php:7.3-fpm
 MAINTAINER "cytopia" <[email protected]>
 
 

Dockerfiles/mods/Dockerfile-7.3

@@ -35,7 +35,6 @@ ENV BUILD_DEPS \
 	libkrb5-dev \
 	libldap2-dev \
 	libmagickwand-dev \
-	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
 	libpng-dev \
@@ -68,7 +67,6 @@ ENV RUN_DEPS \
 	libicu57 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-3 \
-	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
@@ -186,12 +184,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/ldap || true) \
 	&& (rm -rf /usr/local/lib/php/doc/ldap || true) \
 	\
-# ---- Installing PHP Extension: mcrypt ----
-	&& pecl install mcrypt-1.0.1 \
-	&& docker-php-ext-enable mcrypt \
-	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
-	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
-	\
 # ---- Installing PHP Extension: memcached ----
 	&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
 	&& cd /tmp/memcached \
@@ -461,8 +453,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^libxml$' \
 	&& php -m | grep -oiE '^mbstring$' \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
-	&& php -m | grep -oiE '^mcrypt$' \
-	&& php-fpm -m | grep -oiE '^mcrypt$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \

README.md

@@ -566,7 +566,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>7.3</th>
    <td id="73-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.4</th>

build/ansible/DOCKERFILES/Dockerfile-base.j2

@@ -3,8 +3,6 @@
 FROM devilbox/php-fpm-5.2
 {% elif php_version == 5.3 %}
 FROM devilbox/php-fpm-5.3
-{% elif php_version == 7.3 %}
-FROM php:{{ php_version }}-rc-fpm
 {% elif php_version == 7.4 %}
 FROM devilbox/php-fpm-7.4
 {% else %}

build/ansible/group_vars/all.yml

@@ -1025,7 +1025,7 @@ extensions_available:
     all:
       type: builtin
   mcrypt:
-    disabled: [7.4]
+    disabled: [7.3, 7.4]
     7.2:
       type: pecl
       version: 1.0.1