Merge branch '1' into 'master'

1

See merge request interlink-sa/flowdat3/modules/dhcp!41

Dockerfile

@@ -28,12 +28,18 @@ RUN apt-get install -yq php-soap
 
 RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; git clone git@bitbucket.org:ikflowdat/json-wsdl.git /opt/json-wsdl ;  cd /opt/json-wsdl ; composer install --no-scripts --no-interaction --no-progress
 
-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/dhcp.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i 's#listen = 0.0.0.0:9000#listen = /run/php/dhcp.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 --no-progress;\

composer.lock

@@ -1410,7 +1410,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": {
@@ -1434,7 +1434,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",
@@ -1457,7 +1457,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
                 "reference": "a2b2110a69a21e2691266d66e421d2e56dff1c8a"
             },
             "type": "library",
@@ -1503,7 +1503,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
                 "reference": "77c2c8228bb9dfd13add559909fd809508b61388"
             },
             "type": "library",
@@ -1549,7 +1549,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
                 "reference": "a057890183bddcb6f4c431c3b7c9afe6839d8d78"
             },
             "require": {
@@ -1576,7 +1576,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
                 "reference": "ece1ca1df9ca18789ccdcae19a381ee5d9142f6c"
             },
             "type": "library",
@@ -1599,7 +1599,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TemplateBundle.git",
                 "reference": "2c02107d2ec87aad3fca45adc94f6e69f3aa0119"
             },
             "require": {
@@ -1625,7 +1625,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
                 "reference": "68f356b67da08b94cdb7613ad58c5525c88ff950"
             },
             "require": {
@@ -1646,7 +1646,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": {