merge origin/master

Dockerfile

@@ -1,10 +1,10 @@
-FROM debian:8
+FROM debian:9
 EXPOSE 8000
 
 #RUN echo "Acquire::http::Proxy \"http://172.17.0.5:3142\";" | tee /etc/apt/apt.conf.d/00aptproxy
 
 RUN apt-get update 
-RUN apt-get install -yq git wget vim tmux php5-cli php5-mysql php5-curl graphviz
+RUN apt-get install -yq git wget vim tmux php-cli php-mysql php-curl graphviz php-amqplib php7.0-xml php7.0-zip
 
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"

app/AppKernel.php

@@ -35,7 +35,7 @@ class AppKernel extends Kernel
             new TemplateBundle\TemplateBundle(),
             new ExtraDataBundle\ExtraDataBundle(),
             new DeviceBundle\DeviceBundle(),
-            new OwnerVoterBundle\OwnerVoterBundle()
+            new OwnerVoterBundle\OwnerVoterBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "26eeb076c6624846bb4f12cbfbb04882",
+    "content-hash": "48dd7956d5bc2894952bf9cdcbf16888",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1258,7 +1258,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "98d3c7509b02d76ab14c903490da2c8d907807b5"
+                "reference": "a14e47cbb3320e8295c45bcd7ef5c1e4a4c48ca2"
             },
             "type": "library",
             "autoload": {
@@ -1273,7 +1273,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-06-07 14:48:15"
+            "time": "2017-06-08 18:29:12"
         },
         {
             "name": "ik/device-bundle",
@@ -1348,6 +1348,29 @@
             ],
             "time": "2017-04-06 15:40:13"
         },
+        {
+            "name": "ik/owner-voter-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+                "reference": "9ae7b65c59f9cb2216b422744a5e1ffbe429ef29"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "OwnerVoterBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Owner Voter Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bundle",
+                "owner-voter"
+            ],
+            "time": "2017-06-12 15:49:24"
+        },
         {
             "name": "ik/template-bundle",
             "version": "dev-master",
@@ -1401,7 +1424,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "0322c8adaf90d3b31b33679df26e03c7de7b72e5"
+                "reference": "77b59762ad85379c7793359e354f31748b1ea917"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1431,7 +1454,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-06-07 18:22:17"
+            "time": "2017-06-13 18:03:12"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -5505,7 +5528,8 @@
         "ik/workflow-bundle": 20,
         "ik/template-bundle": 20,
         "ik/extra-data-bundle": 20,
-        "ik/device-bundle": 20
+        "ik/device-bundle": 20,
+        "ik/owner-voter-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,