Merge pull request #231 from devilbox/release-0.136

Release 0.136

.github/workflows/nightly.yml

@@ -41,7 +41,7 @@ jobs:
           - '8.2'
         refs:
           - 'master'
-          - '0.135'
+          - '0.136'
     steps:
 
       # ------------------------------------------------------------

CHANGELOG.md

@@ -4,6 +4,20 @@
 ## Unreleased
 
 
+## Release 0.136
+
+#### Fixed
+- Fixed `mongodb-org-shell` and `mongodb-org-tools` install
+
+#### Added
+- Re-added `mongodb` for PHP 5.3
+
+#### Changed
+- Switch PHP 5.4 base image to [devilbox/php-fpm-5.4](https://github.com/devilbox/docker-php-fpm-5.4) for potential arm64 support
+- Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for potential arm64 support
+- Changed base image back to Debian Jessie for PHP 5.2 and PHP 5.3
+
+
 ## Release 0.135
 
 #### Fixed

Dockerfiles/base/Dockerfile-5.4

@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM php:5.4-fpm
+FROM devilbox/php-fpm-5.4
 MAINTAINER "cytopia" <cytopia@everythingcli.org>
 
 
@@ -43,13 +43,6 @@ RUN set -eux \
 ###
 ### Upgrade (install ps)
 ###
-RUN set -eux \
-	&& rm -f /etc/apt/sources.list \
-	&& { \
-		echo "deb http://ftp.debian.org/debian jessie main"; \
-		echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
-		echo "deb http://security.debian.org/debian-security jessie/updates main"; \
-	} | tee /etc/apt/sources.list
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \

Dockerfiles/base/Dockerfile-5.5

@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM php:5.5-fpm
+FROM devilbox/php-fpm-5.5
 MAINTAINER "cytopia" <cytopia@everythingcli.org>
 
 
@@ -43,13 +43,6 @@ RUN set -eux \
 ###
 ### Upgrade (install ps)
 ###
-RUN set -eux \
-	&& rm -f /etc/apt/sources.list \
-	&& { \
-		echo "deb http://ftp.debian.org/debian jessie main"; \
-		echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
-		echo "deb http://security.debian.org/debian-security jessie/updates main"; \
-	} | tee /etc/apt/sources.list
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \

Dockerfiles/mods/Dockerfile-5.2

@@ -26,12 +26,12 @@ RUN set -eux \
 		libmagic-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libmysqlclient-dev \
 		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
-		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssl-dev \
@@ -43,8 +43,28 @@ RUN set -eux \
 		libxslt-dev \
 		snmp \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -134,22 +154,14 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: ftp --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure ftp --with-openssl-dir \
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \
-	&& true
-
-
 # -------------------- Installing PHP Extension: gd --------------------
 RUN set -eux \
 	# Version specific pre-command
 	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
 ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
-ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
+mkdir /usr/include/freetype2/freetype && \
+ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
  \
 	# Installation: Version specific
 	# Type:         Built-in extension
@@ -275,6 +287,25 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: mysql --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         Built-in extension
+	# Custom:       configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
+	&& true
+
+
+# -------------------- Installing PHP Extension: mysqli --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
+	&& true
+
+
 # -------------------- Installing PHP Extension: oauth --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -323,6 +354,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: pdo_mysql --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
+	&& true
+
+
 # -------------------- Installing PHP Extension: pdo_pgsql --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -358,14 +400,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: recode --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
-	&& true
-
-
 # -------------------- Installing PHP Extension: redis --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -395,6 +429,16 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: soap --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         Built-in extension
+	# Custom:       configure command
+	&& docker-php-ext-configure soap --with-libxml-dir=/usr \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sockets --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -560,22 +604,24 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu57 \
+	libicu52 \
 	libjpeg62-turbo \
-	libmariadbclient18 \
+	libmagic1 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libpng16-16 \
+	libmysqlclient18 \
+	libpng12-0 \
 	libpq5 \
-	librabbitmq4 \
+	librabbitmq1 \
 	librecode0 \
 	libsybdb5 \
-	libtidy5 \
-	libvpx4 \
-	libwebp6 \
+	libtidy-0.99-0 \
+	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	snmp \
+	zlib1g \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
@@ -662,6 +708,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^memcache$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
+	&& php -m | grep -oiE '^mhash$' \
+	&& php-fpm -m | grep -oiE '^mhash$' \
 	&& php -m | grep -oiE '^mongo$' \
 	&& php-fpm -m | grep -oiE '^mongo$' \
 	&& php -m | grep -oiE '^mysql$' \