Merge branch 'v4' of github.com:thecodingmachine/docker-images-php into v4

Author: moufmouf

build-and-test.sh

@@ -19,6 +19,10 @@ docker run --rm test/slim_onbuild php -m | grep pdo_pgsql
 docker run --rm test/slim_onbuild php -m | grep pdo_sqlite
 docker rmi test/slim_onbuild
 
+# Let's check that the extensions are available for composer using "ARG PHP_EXTENSIONS" statement:
+docker build -t test/slim_onbuild_composer --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg BRANCH="$BRANCH" --build-arg BRANCH_VARIANT="$BRANCH_VARIANT" tests/slim_onbuild_composer
+docker rmi test/slim_onbuild_composer
+
 # Post build unit tests
 if [[ $VARIANT == cli* ]]; then CONTAINER_CWD=/usr/src/app; else CONTAINER_CWD=/var/www/html; fi
 # Default user is 1000

tests/slim_onbuild_composer/Dockerfile

@@ -0,0 +1,11 @@
+ARG BRANCH
+ARG BRANCH_VARIANT
+ARG PHP_VERSION
+
+ARG PHP_EXTENSIONS="gd"
+FROM thecodingmachine/php:${PHP_VERSION}-${BRANCH}-slim-${BRANCH_VARIANT}
+
+COPY composer.json composer.json
+
+# Let's check that GD is available.
+RUN composer install

tests/slim_onbuild_composer/composer.json

@@ -0,0 +1,5 @@
+{
+  "require": {
+    "ext-gd": "*"
+  }
+}

utils/check_php_env_var_changes.php

@@ -1,7 +1,6 @@
 <?php
 
 $phpEnvVarCache = include '/opt/php_env_var_cache.php';
-
 $envVars = getenv();
 $shouldGenerateConfig = false;
 $phpEnvVar = [];

utils/install_selected_extensions.sh

@@ -8,7 +8,7 @@ mv /etc/apt/apt.conf.d/docker-clean /tmp/docker-clean
 
 apt-get update
 
-php /usr/local/bin/install_selected_extensions.php
+/usr/bin/real_php /usr/local/bin/install_selected_extensions.php
 
 # Let's enable autoclean again
 mv /tmp/docker-clean /etc/apt/apt.conf.d/docker-clean

utils/php_proxy.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#set -e
-
 sudo chown docker:docker /opt/php_env_var_cache.php
 
 REGENERATE=$(/usr/bin/real_php /usr/local/bin/check_php_env_var_changes.php)