Using the official composer image (webdevops#183)

* Fix dns lookup * Revert "Fix dns lookup" Doesn’t fix dns issue, was maybe a temp issue. This reverts commit c5947f0be801a5499e5f86d4cb72a1350f5fc00a. * Add php environment settings available in docker images after 2017-06-15 * Using the official composer container
DoPaNik · Aug 28, 2017 · 442f71f · 442f71f
1 parent bf17b56
commit 442f71f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/bin/create-project.sh b/bin/create-project.sh
@@ -23,15 +23,15 @@ case "$1" in
     ## TYPO3 CMS
     ###################################
     "typo3")
-        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer/composer:alpine create-project typo3/cms-base-distribution /app"
+        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer:latest create-project typo3/cms-base-distribution /app"
         execInDir "$CODE_DIR" "touch web/FIRST_INSTALL"
         ;;
 
     ###################################
     ## TYPO3 NEOS
     ###################################
     "neos")
-        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer/composer:alpine create-project neos/neos-base-distribution /app"
+        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer:latest create-project neos/neos-base-distribution /app"
         echo "\nNOTE: You probably want to change the WEB_DOCUMENT_ROOT env in your etc/environment.yml to '/app/Web/' and run 'docker-composer up -d app' to populate the change."
         ;;
 

diff --git a/etc/environment.yml b/etc/environment.yml
@@ -46,6 +46,35 @@ CLI_SCRIPT=php /app/web/typo3/cli_dispatch.phpsh
 # fpm.pool.pm.max_requests=1000
 # fpm.pool.request_terminate_timeout=5m
 
+#######################################
+# PHP settings
+# (available in docker images after 2017-06-15)
+
+# PHP.ini
+
+# php.memory_limit=2G
+# php.date.timezone=UTC
+# php.display_errors=1
+# php.max_execution_time=600
+# php.post_max_size=50M
+# php.upload_max_filesize=50M
+
+# FPM global (master)
+
+# fpm.global.process_control_timeout=5m
+# fpm.global.process.max=100
+
+# FPM pool
+
+# fpm.pool.pm=dynamic
+# fpm.pool.pm.max_children=20
+# fpm.pool.pm.start_servers=20
+# fpm.pool.pm.min_spare_servers=1
+# fpm.pool.pm.max_spare_servers=3
+# fpm.pool.pm.process_idle_timeout=10s
+# fpm.pool.pm.max_requests=1000
+# fpm.pool.request_terminate_timeout=5m
+
 #######################################
 # SSH settings
 # SSH public key (without comment):