Merge branch '2' into 'master'

2

See merge request interlink-sa/flowdat3/modules/stats!51

Dockerfile

@@ -29,12 +29,18 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
 
 RUN apt-get update && apt-get install -yq gdal-bin
 
-RUN apt-get update && apt-get install -yq php-fpm
-RUN sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = 0.0.0.0:9000#g' /etc/php/7.0/fpm/pool.d/www.conf
-RUN sed -i 's#;clear_env = no#clear_env = no#g' /etc/php/7.0/fpm/pool.d/www.conf
-RUN sed -i 's#user = www-data#user = root#g' /etc/php/7.0/fpm/pool.d/www.conf
-RUN sed -i 's#group = www-data#group = root#g' /etc/php/7.0/fpm/pool.d/www.conf
-RUN mkdir -p /run/php
+RUN apt-get update && apt-get install -yq php-fpm; \
+    mkdir -p /run/php; \
+    sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = /run/php/stats.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#listen = 0.0.0.0:9000#listen = /run/php/stats.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#;clear_env = no#clear_env = no#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#user = www-data#user = root#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#group = www-data#group = root#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#listen.owner = www-data#listen.owner = root#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#listen.group = www-data#listen.group = root#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#;listen.mode = 0660#listen.mode = 0777#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#pm.max_children = 5#pm.max_children = 10#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#;pm.max_requests = 500#pm.max_requests = 500#g' /etc/php/7.0/fpm/pool.d/www.conf
 
 CMD  eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
     rm var/cache/* -rf ;\

composer.lock

@@ -1593,7 +1593,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuditBundle.git",
                 "reference": "34dece40daad7031e332f02314b681bb9ee1cd14"
             },
             "require": {
@@ -1617,7 +1617,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuthBundle.git",
                 "reference": "c8e77dce32b92c08d75e12c537ead77bf976cd84"
             },
             "type": "library",
@@ -1709,7 +1709,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
                 "reference": "bcf009e03ace356adfd92a7a89f814aa2e96fb6c"
             },
             "require": {
@@ -2037,7 +2037,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
                 "reference": "29bc76615564c555cc3c98cf4c0e27d70b7bfa08"
             },
             "require": {