Merged in FD3-67 (pull request #9)

FD3-67

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>

.drone.yml

@@ -4,6 +4,8 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+  amqp:
+    image: rabbitmq:3-management
 pipeline:
  build:
     image: debian:8.0
@@ -25,14 +27,6 @@ pipeline:
       - apt-get update 
       - apt-get install -yq php7.0-cli php7.0-mysql mysql-client php7.0-curl php7.0-xml php7.0-bcmath php7.0-mbstring
       
-      # RabbitMQ apt repository
-      - echo 'deb http://www.rabbitmq.com/debian/ testing main' | tee /etc/apt/sources.list.d/rabbitmq.list
-      - wget -O- https://www.rabbitmq.com/rabbitmq-release-signing-key.asc | apt-key add -
-      - apt-get update && apt-get install -yq rabbitmq-server
-      - echo 'export RABBITMQ_NODENAME=rabbit@localhost' | tee /etc/rabbitmq/rabbitmq-env.conf
-      - echo 'export RABBITMQ_NODE_IP_ADDRESS=127.0.0.1' | tee /etc/rabbitmq/rabbitmq-env.conf
-      - service rabbitmq-server restart
-
       - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
       - php composer-setup.php --install-dir=/usr/local/bin/ --filename=composer
       - php -r "unlink('composer-setup.php');"
@@ -42,9 +36,12 @@ pipeline:
       - mkdir -p /root/.ssh/
       - ssh-keyscan -p222 200.50.168.30 >> ~/.ssh/known_hosts
       - ssh-keyscan -p222 infra.flowdat.com >> ~/.ssh/known_hosts
+      - ssh-keyscan -p22 bitbucket.org >> ~/.ssh/known_hosts
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
+      - composer update -n
       - composer install -n
+      - composer dump-autoload --optimize
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - vendor/phpunit/phpunit/phpunit --tap

app/AppKernel.php

@@ -36,6 +36,8 @@ class AppKernel extends Kernel
             new ExtraDataBundle\ExtraDataBundle(),
             new DeviceBundle\DeviceBundle(),
             new OwnerVoterBundle\OwnerVoterBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new MigrationsBundle\MigrationsBundle()
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/parameters.yml.dist

@@ -23,7 +23,7 @@ parameters:
     url_logout: 'http://127.0.0.1/base/app_dev.php/logout'
 
     # RabbitMQ parameters
-    rabbit_mq.host:     'localhost'
+    rabbit_mq.host:     127.0.0.1
     rabbit_mq.port:     5672
     rabbit_mq.user:     'guest'
     rabbit_mq.password: 'guest'

composer.json

@@ -21,55 +21,63 @@
             "type": "vcs",
             "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
             "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git"
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git"
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git"
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git"
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
+            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
             "options": {
-                    "local_pk": "./keys/bitbucket.id_rsa"
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
             }
         }
     ],
-    "config":{
-        "secure-http": false
+    "config": {
+        "secure-http": false,
+        "optimize-autoloader": true
     },
     "require": {
         "php": ">=5.5.9",
@@ -98,7 +106,10 @@
         "ik/template-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
-        "ik/owner-voter-bundle": "dev-master"
+        "ik/owner-voter-bundle": "dev-master",
+        "doctrine/doctrine-migrations-bundle": "^1.2",
+        "ik/migrations-bundle": "dev-master",
+        "samsonasik/package-versions": "1.1.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
@@ -119,15 +130,22 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ],
-        "chmod-dir-cache-sessions-logs":"chmod 777 -R var/cache var/logs var/sessions",
+        "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 && echo y",
+        "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration",
         "post-install-cmd": [
             "@workflows-commands",
             "@symfony-scripts",
-            "@chmod-dir-cache-sessions-logs"
+            "@mkdir-dir-cache-sessions-logs",
+            "@chmod-dir-cache-sessions-logs",
+            "@doctrine-update",
+            "@doctrine-migrations"
         ],
         "post-update-cmd": [
             "@workflows-commands",
             "@symfony-scripts",
+            "@mkdir-dir-cache-sessions-logs",
             "@chmod-dir-cache-sessions-logs"
         ]
     },