Update vendors. Update Dockerfile

Dockerfile

@@ -1,22 +1,24 @@
 FROM docker.infra.flowdat.com/fd3/sf-php:latest
 EXPOSE 8000
 
-ADD . /opt/radius
+ADD . /opt/cablemodem
 
-WORKDIR /opt/radius
+WORKDIR /opt/cablemodem
 
-RUN rm -rf /opt/radius/vendor/*
+RUN rm -rf /opt/cablemodem/vendor/*
 RUN rm -f app/config/parameters.yml
-RUN rm -f app/config/url_webservice.yml
-RUN rm -f app/config/hwioauthbundle/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/url_webservice.yml.docker app/config/url_webservice.yml
-RUN cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/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 rm -rf /opt/radius/app/config/parameters.yml /opt/radius/app/config/url_webservice.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/*
 
@@ -26,21 +28,8 @@ 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 cp app/config/parameters.yml.docker app/config/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
- 	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
- 	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker 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
-
-CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress;\
-	rm var/cache/* -rf ;\
- 	cp app/config/parameters.yml.docker app/config/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
- 	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
- 	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker 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 ;\
-	composer run-script post-install-cmd --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ;\
- 	php bin/console server:run 0.0.0.0 --env=dev
+CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ;\
+    composer install --no-scripts --no-interaction --no-progress;\
+    rm var/cache/* -rf ;\
+    composer run-script post-install-cmd --no-interaction ;\
+    php bin/console server:run 0.0.0.0 --env=dev

app/config/parameters.yml.dist

@@ -17,3 +17,19 @@ parameters:
 
     # A secret key that's used to generate certain security-related tokens
     secret: ThisTokenIsNotSoSecretChangeIt
+
+    jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
+
+    # amqp queue config
+    rabbit_mq.host:     'amqp'
+    rabbit_mq.port:     5672
+    rabbit_mq.user:     'guest'
+    rabbit_mq.password: 'guest'
+    rabbit_mq.vhost:    '/'
+
+    db_session_host: mysql
+    db_session_port: ~
+    db_session_name: fd_session
+    db_session_user: root
+    db_session_password: 235r2342gtfsw
+    env(AMQP_KEY) : ""

composer.json

@@ -19,24 +19,169 @@
             "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
         ]
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://satis.infra.flowdat.com/"
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TemplateBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuditBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/3erPartyFlowdat3/SonataAdminBundle.git",
+            "name": "ik-sonata"
+        }
+    ],
+    "config": {
+        "secure-http": false,
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "require": {
         "php": ">=5.5.9",
+        "cocur/slugify": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-cache-bundle": "^1.2",
+        "doctrine/doctrine-migrations-bundle": "^1.2",
+        "doctrine/instantiator": "^1.0.5",
         "doctrine/orm": "^2.5",
+        "hwi/oauth-bundle": "^0.5.3",
         "incenteev/composer-parameter-handler": "^2.0",
-        "sensio/distribution-bundle": "^5.0.19",
+        "jms/serializer": "^1.9.0",
+        "jms/serializer-bundle": "^1.5.0",
+        "jdorn/sql-formatter": "^1.2.17",
+        "php-amqplib/rabbitmq-bundle": "^1.12",
+        "samsonasik/package-versions": "1.1.0",
+        "sensio/distribution-bundle": "^5.0.21",
         "sensio/framework-extra-bundle": "^3.0.2",
+        "sonata-project/admin-bundle": "dev-bf4681",
+        "sonata-project/doctrine-orm-admin-bundle": "^3.1",
+        "stof/doctrine-extensions-bundle": "^1.2",
+        "swiftmailer/swiftmailer": "^5.4",
+        "symfony/assetic-bundle": "^2.8.2",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/symfony": "3.3.*",
-        "twig/twig": "^1.0||^2.0"
+        "symfony/web-server-bundle": "^3.3",
+        "twig/extensions": "^1.5",
+        "twig/twig": "^2.0",
+        "voryx/restgeneratorbundle": "dev-master",
+        "ik/audit-bundle": "dev-master",
+        "ik/auth-bundle": "dev-master",
+        "ik/base-admin-bundle": "dev-master",
+        "ik/device-bundle": "dev-master",
+        "ik/extra-data-bundle": "dev-master",
+        "ik/leaflet-bundle": "dev-master",
+        "ik/map-bundle": "dev-master",
+        "ik/migrations-bundle": "dev-master",
+        "ik/oauthclient-bundle": "dev-master",
+        "ik/webservice-bundle": "dev-master",
+        "ik/owner-voter-bundle": "dev-master",
+        "ik/template-bundle": "dev-master",
+        "ik/workflow-bundle": "dev-master"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.4",
         "sensio/generator-bundle": "^3.0",
         "symfony/phpunit-bridge": "^3.0"
     },
     "scripts": {
+        "workflows-commands": [
+            "chown -Rf www-data:www-data app/Resources/workflows",
+            "cp -n app/Resources/workflows/workflow_list.yml.dist app/Resources/workflows/workflow_list.yml",
+            "chown -Rf www-data:www-data app/Resources/workflows/workflow_list.yml",
+            "chown -Rf www-data:www-data web/workflows_png"
+        ],
         "symfony-scripts": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
@@ -45,11 +190,26 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ],
+        "mkdir-dir-cache-sessions-logs": "mkdir -p var/cache var/logs var/sessions",
+        "chmod-dir-cache-sessions-logs": "chmod 777 -R var/cache var/logs var/sessions",
+        "doctrine-update": "php bin/console doctrine:schema:update --force",
+        "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration",
+        "auto-increment": "php bin/console baseadmin:autoincrement",
         "post-install-cmd": [
-            "@symfony-scripts"
+            "@workflows-commands",
+            "@symfony-scripts",
+            "@mkdir-dir-cache-sessions-logs",
+            "@chmod-dir-cache-sessions-logs",
+            "@doctrine-update",
+            "@auto-increment",
+            "@doctrine-migrations"
         ],
         "post-update-cmd": [
-            "@symfony-scripts"
+            "@workflows-commands",
+            "@symfony-scripts",
+            "@mkdir-dir-cache-sessions-logs",
+            "@chmod-dir-cache-sessions-logs",
+            "@auto-increment"
         ]
     },
     "config": {
@@ -62,9 +222,26 @@
         "symfony-web-dir": "web",
         "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
-        "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
-        },
+        "incenteev-parameters": [
+            {
+                "file": "app/config/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/hwi/oauth-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/base-admin-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/device-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/webservice-bundle/parameters.yml"
+            }
+        ],
         "branch-alias": null
     }
 }