Merge pull request #142 from devilbox/release-0.97

Use official PHP 7.4 image
devilbox · Dec 28, 2019 · 3ce6ed5 · 3ce6ed5
2 parents 9c1e49b + f053015
commit 3ce6ed5
Show file tree

Hide file tree

Showing 14 changed files with 288 additions and 104 deletions.
diff --git a/Dockerfiles/base/Dockerfile-7.4 b/Dockerfiles/base/Dockerfile-7.4
@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM devilbox/php-fpm-7.4
+FROM php:7.4-fpm
 MAINTAINER "cytopia" <[email protected]>
 
 

diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
@@ -286,7 +286,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo-1.5.8 \
+	&& yes yes | pecl install mongo-1.5.8 \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -297,7 +297,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
@@ -297,7 +297,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -280,7 +280,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -309,7 +309,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -574,6 +575,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: ssh2 --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -756,6 +768,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5 \
 	libvpx4 \
@@ -938,6 +951,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -562,6 +563,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -573,12 +585,23 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
+# -------------------- Installing PHP Extension: ssh2 --------------------
 RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install swoole \
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -754,6 +777,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -933,10 +957,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -566,6 +567,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -577,12 +589,23 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
+# -------------------- Installing PHP Extension: ssh2 --------------------
 RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install swoole \
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -758,6 +781,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -939,10 +963,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -10,7 +10,6 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
 		alien \
-		cmake \
 		firebird-dev \
 		freetds-dev \
 		libaio-dev \
@@ -22,7 +21,6 @@ RUN set -eux \
 		libfbclient2 \
 		libfreetype6-dev \
 		libgmp-dev \
-		libhiredis-dev \
 		libib-util \
 		libicu-dev \
 		libjpeg-dev \
@@ -41,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -287,6 +286,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: memcache --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install memcache \
+	# Enabling
+	&& docker-php-ext-enable memcache \
+	&& true
+
+
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -557,6 +567,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -568,25 +589,23 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: ssh2 --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/swoole/swoole-src /tmp/swoole \
-	&& cd /tmp/swoole \
-	# Custom:       Branch
-	&& git checkout $(git describe --abbrev=0 --tags) \
-	# Custom:       Install command
-	&& phpize \
-&& ./configure \
-  --enable-openssl \
-  --enable-sockets \
-  --enable-http2 \
-  --enable-mysqlnd \
-  --enable-coroutine-postgresql \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -751,7 +770,6 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libhiredis0.14 \
 	libicu63 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
@@ -763,6 +781,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -871,6 +890,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^mcrypt$' \
 	&& php -m | grep -oiE '^msgpack$' \
 	&& php-fpm -m | grep -oiE '^msgpack$' \
+	&& php -m | grep -oiE '^memcache$' \
+	&& php-fpm -m | grep -oiE '^memcache$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -942,10 +963,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \