Merge branch '2' into 'master'

2

See merge request interlink-sa/flowdat3/modules/cablemodem!34

Dockerfile

@@ -1,39 +1,29 @@
 FROM docker.infra.flowdat.com/fd3/sf-php:latest
-EXPOSE 9000
 
 ADD . /opt/cablemodem
 
 WORKDIR /opt/cablemodem
 
-RUN rm -rf /opt/cablemodem/vendor/*
-RUN rm -f app/config/parameters.yml
-RUN rm -f app/config/bundles/hwi/oauth-bundle/parameters.yml
-RUN rm -f app/config/bundles/ik/audit-bundle/parameters.yml
-RUN rm -f app/config/bundles/ik/base-admin-bundle/parameters.yml
-RUN rm -f app/config/bundles/ik/device-bundle/parameters.yml
-RUN rm -f app/config/bundles/ik/webservice-bundle/parameters.yml
-
-#RUN cp app/config/parameters.yml.docker app/config/parameters.yml
-#RUN cp app/config/bundles/hwi/oauth-bundle/parameters.yml.docker app/config/bundles/hwi/oauth-bundle/parameters.yml
-#RUN cp app/config/bundles/ik/audit-bundle/parameters.yml.dist app/config/bundles/ik/audit-bundle/parameters.yml
-#RUN cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
-#RUN cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml
-#RUN cp app/config/bundles/ik/webservice-bundle/parameters.yml.docker app/config/bundles/ik/webservice-bundle/parameters.yml
-
-RUN chmod 0600 /opt/keys/*
-
-RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress
-
-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
-
 COPY docsis.sh /opt
-RUN chmod +x /opt/docsis.sh
-RUN bash -c /opt/docsis.sh
-COPY docsis/custom_mibs /usr/share/snmp/mibs/
 
-RUN apt-get update && apt-get install -yq php-fpm; \
+RUN chmod 0600 /opt/keys/*; \
+    eval $(ssh-agent); \
+    ssh-add /opt/keys/bitbucket.id_rsa; \
+    rm -f app/config/parameters.yml \
+          app/config/bundles/hwi/oauth-bundle/parameters.yml \
+          app/config/bundles/ik/audit-bundle/parameters.yml \
+          app/config/bundles/ik/base-admin-bundle/parameters.yml \
+          app/config/bundles/ik/device-bundle/parameters.yml \
+          app/config/bundles/ik/webservice-bundle/parameters.yml; \
+    cp app/Resources/workflows/workflow_list.yml.dist app/Resources/workflows/workflow_list.yml; \
+    cp app/config/tenencia/cablemodem_1.yml.dist app/config/tenencia/cablemodem_1.yml; \
+    cp app/config/bundles/hwi/oauth-bundle/parameters.yml.dist app/config/bundles/hwi/oauth-bundle/parameters.yml; \
+    cp app/config/bundles/ik/audit-bundle/parameters.yml.dist app/config/bundles/ik/audit-bundle/parameters.yml; \
+    cp app/config/bundles/ik/device-bundle/parameters.yml.dist app/config/bundles/ik/device-bundle/parameters.yml; \
+    cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml; \
+    cp app/config/bundles/ik/webservice-bundle/parameters.yml.dist app/config/bundles/ik/webservice-bundle/parameters.yml; \
+    cp app/config/profile.yml.dist app/config/profile.yml; \
+    cp app/config/parameters.yml.dist app/config/parameters.yml; \
     mkdir -p /run/php; \
     sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = /run/php/cablemodem.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
     sed -i 's#listen = 0.0.0.0:9000#listen = /run/php/cablemodem.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
@@ -44,11 +34,18 @@ RUN apt-get update && apt-get install -yq php-fpm; \
     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
+    sed -i 's#;pm.max_requests = 500#pm.max_requests = 500#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    composer install --no-scripts --no-interaction --no-progress; \
+    chmod 777 -R var/cache/ var/logs/ var/sessions/; \ 
+    git clone git@bitbucket.org:ikflowdat/json-wsdl.git /opt/json-wsdl; \
+    cd /opt/json-wsdl; \
+    composer install --no-scripts --no-interaction --no-progress; \
+    chmod +x /opt/docsis.sh; \
+    bash -c /opt/docsis.sh; \
+    rm -rf /var/lib/apt/lists/*
+    
+COPY docsis/custom_mibs /usr/share/snmp/mibs/
 
-CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ;\
-    composer install --no-scripts --no-interaction --no-progress;\
-    rm var/cache/* -rf ;\
+CMD rm var/cache/* -rf ;\
     composer run-script post-install-cmd --no-interaction ;\
-    chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\
     php-fpm7.0 -F -R -O

app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -7,10 +7,10 @@ parameters:
     url_dhcp: 'https://%env(HOST_DHCP)%'
     url_dummy: 'https://%env(HOST_DUMMY)%'
     client: '%url_base%/api/clients.json'
-    active_menu: Cablemodems
+    active_menu: Cablemodem
     navbar_menu:
         Base: '%url_base%'
-        Cablemodems: '%url_cablemodem%'
+        Cablemodem: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Stats: '%url_stats%'
         DHCP: '%url_dhcp%'

app/config/bundles/ik/webservice-bundle/parameters.yml.docker

@@ -7,10 +7,10 @@ parameters:
     url_dhcp: 'https://%env(HOST_DHCP)%'
     url_dummy: 'https://%env(HOST_DUMMY)%'
     client: '%url_base%/api/clients.json'
-    active_menu: Cablemodems
+    active_menu: Cablemodem
     navbar_menu:
         Base: '%url_base%'
-        Cablemodems: '%url_cablemodem%'
+        Cablemodem: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Stats: '%url_stats%'
         DHCP: '%url_dhcp%'

composer.json

@@ -209,6 +209,7 @@
         "workflow-default": "php bin/console workflow:default --class=CablemodemBundle\\\\Entity\\\\Cablemodem --all",
         "profile-yml": "cp -n app/config/profile.yml.dist app/config/profile.yml",
 	    "update-data": "php bin/console ik:update:data 'app/DoctrineMigrations/src/'",
+        "assets-static": " bin/console assets:install web",
         "post-install-cmd": [
             "@workflows-commands",
             "@profile-yml",
@@ -221,7 +222,8 @@
             "@doctrine-migrations",
             "@auto-increment",
             "@init-template-docsis",
-            "@workflow-default"
+            "@workflow-default",
+            "@assets-static"
         ],
         "post-update-cmd": [
             "@workflows-commands",
@@ -230,7 +232,8 @@
             "@mkdir-dir-cache-sessions-logs",
             "@chmod-dir-cache-sessions-logs",
             "@auto-increment",
-            "@workflow-default"
+            "@workflow-default",
+            "@assets-static"
         ]
     },
     "extra": {