Merge branch 'master' of https://bitbucket.org/ikflowdat/stats into FD3-93

.drone.yml

@@ -4,21 +4,17 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+  amqp:
+    image: rabbitmq:3-management
+
+
 pipeline:
-  build:
-    image: debian:8.0
-    commands:
+ build:
+  image: debian:8.0
+  commands:
       - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy
       - apt-get update && apt-get install -yq build-essential git unzip php5-cli php5-mysql wget mysql-client php5-curl
       
-      # 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');"
@@ -26,8 +22,10 @@ pipeline:
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php5/cli/php.ini
       - yes | mysqladmin -h 127.0.0.1 create flowdat_stats
       - mkdir -p /root/.ssh/
+      - ssh-keyscan bitbucket.org >> ~/.ssh/known_hosts
       - ssh-keyscan -p222 200.50.168.30 >> ~/.ssh/known_hosts
       - ssh-keyscan -p222 infra.flowdat.com >> ~/.ssh/known_hosts
+      - ssh-keyscan -p222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - composer update -n
@@ -35,3 +33,12 @@ pipeline:
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - vendor/phpunit/phpunit/phpunit --tap
+
+ docker:
+   repo : docker.infra.flowdat.com/fd3/stats
+   image: plugins/docker
+   email: luciano@interlink.com.ar
+   registry: docker.infra.flowdat.com
+   username: drone
+   password: 6hd2dLfL
+   tag: latest

composer.lock

@@ -1262,7 +1262,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "6fc6cf57add753c378067f07ce58e894185533bf"
+                "reference": "562c7a82d0359af5bd327eba50ba2a5eb814f4a6"
             },
             "type": "library",
             "autoload": {
@@ -1277,7 +1277,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-07-10 18:32:01"
+            "time": "2017-07-27 15:18:46"
         },
         {
             "name": "ik/device-bundle",
@@ -1285,7 +1285,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "e8ca2d03e566e7a7daa02cb9355a5f4f051ce024"
+                "reference": "5af388f4abfdc6cdc8bf03f669574b511cf23398"
             },
             "type": "library",
             "autoload": {
@@ -1300,7 +1300,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-07-05 12:23:57"
+            "time": "2017-07-25 15:32:04"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1447,7 +1447,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "1c50e96e43fdc76c8a0393d514799675c23f669f"
+                "reference": "9f6a6ee18df666f0f85846573f894ab76b65fea5"
             },
             "require": {
                 "ext-curl": "*",
@@ -1460,7 +1460,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-06-05 15:48:18"
+            "time": "2017-07-25 15:31:35"
         },
         {
             "name": "incenteev/composer-parameter-handler",