Merge pull request #23 from magento-commerce/develop

Release 1.2.1

Author: oshmyheliuk

codeception.dist.yml

@@ -26,6 +26,7 @@ modules:
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"
       use_generated_images: false
+      generated_images_namespace: "cloudft"
       use_cached_workdir: true
       version_generated_images: "%TRAVIS_BUILD_NUMBER%"
       printOutput: false

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

images/nginx/1.19/Dockerfile

@@ -1,15 +1,17 @@
-FROM nginx
+FROM nginx:1.19
 
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV XDEBUG_HOST fpm_xdebug
 ENV FPM_HOST fpm
 ENV FPM_PORT 9000
 ENV UPSTREAM_HOST web
-ENV UPSTREAM_PORT 80
+ENV UPSTREAM_PORT 8080
 ENV MAGENTO_ROOT /app
 ENV MAGENTO_RUN_MODE production
 ENV MFTF_UTILS 0
 ENV DEBUG false
+ENV NGINX_WORKER_PROCESSES 1
+ENV NGINX_WORKER_CONNECTIONS 1024
 
 COPY etc/nginx.conf /etc/nginx/
 COPY etc/vhost.conf /etc/nginx/conf.d/default.conf

images/nginx/1.19/docker-entrypoint.sh

@@ -18,6 +18,8 @@ XDEBUG_UPSTREAM_FILE="/etc/nginx/conf.d/xdebug/upstream.conf"
 [ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" $VHOST_FILE
 [ ! -z "${WITH_XDEBUG}" ] && sed -i "s/!WITH_XDEBUG!/${WITH_XDEBUG}/" $VHOST_FILE
 [ "${WITH_XDEBUG}" == "1" ] && sed -i "s/#include_xdebug_upstream/include/" $NGINX_FILE
+[ ! -z "${NGINX_WORKER_PROCESSES}" ] && sed -i "s/!NGINX_WORKER_PROCESSES!/${NGINX_WORKER_PROCESSES}/" $NGINX_FILE
+[ ! -z "${NGINX_WORKER_CONNECTIONS}" ] && sed -i "s/!NGINX_WORKER_CONNECTIONS!/${NGINX_WORKER_CONNECTIONS}/" $NGINX_FILE
 
 # Check if the nginx syntax is fine, then launch.
 nginx -t

images/nginx/1.19/etc/nginx.conf

@@ -1,12 +1,12 @@
-worker_processes 2;
+worker_processes !NGINX_WORKER_PROCESSES!;
 
 error_log /var/log/nginx/error.log debug;
 pid /var/run/nginx.pid;
 
 events {
   # this should be equal to value of "ulimit -n"
   # reference: https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
-  worker_connections 1048576;
+  worker_connections !NGINX_WORKER_CONNECTIONS!;
 }
 
 http {

images/php/7.2-cli/Dockerfile

@@ -134,8 +134,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.2-fpm/Dockerfile

@@ -113,8 +113,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.2-fpm/fpm-healthcheck.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
-fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-80}/status)
+fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-8080}/status)
 
 if [ "$fpm_response" == "200" ]
 then

images/php/7.3-cli/Dockerfile

@@ -131,8 +131,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.3-fpm/Dockerfile

@@ -110,8 +110,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \