X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fbottleneck-compose%2Fdocker-compose.yml;h=31f836981667537a881e88e5626ad1e21c33b74f;hb=8fd28cfeaca4ac29f4357c51eb0c0374d0d0a409;hp=0b256b5b3b927c5d4ed51b2badd174466cf8ab52;hpb=afea25c89a2d1ae1b1c7ca6641652c0adc0dba02;p=bottlenecks.git

diff --git a/docker/bottleneck-compose/docker-compose.yml b/docker/bottleneck-compose/docker-compose.yml
index 0b256b5b..31f83698 100644
--- a/docker/bottleneck-compose/docker-compose.yml
+++ b/docker/bottleneck-compose/docker-compose.yml
@@ -1,6 +1,7 @@
 elasticsearch:
   image: elasticsearch:2.4.0
   command: elasticsearch -Des.network.host=0.0.0.0
+  privileged: true
   ports:
     - "9200:9200"
     - "9300:9300"
@@ -9,6 +10,7 @@ kibana:
   build: kibana/
   volumes:
     - ./kibana/config/:/opt/kibana/config/
+  privileged: true
   ports:
     - "5601:5601"
   links:
@@ -16,12 +18,29 @@ kibana:
 
 yardstick:
   restart: always
-  build: yardstick/
+  image: opnfv/yardstick:latest
   volumes:
-    - /var/run/docker/sock:/var/run/docker/sock
+    - /var/run/docker.sock:/var/run/docker.sock
+    - /tmp/:/tmp/
   ports:
     - "8888:5000"
+  privileged: true
+  environment:
+    - INSTALLER_IP=192.168.200.2
+    - INSTALLER_TYPE=compass
 
 bottlenecks:
   restart: always
-  build: bottlenecks/
\ No newline at end of file
+  build: bottlenecks/
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - /tmp/:/tmp/
+  privileged: true
+  environment:
+    - INSTALLER_IP=192.168.200.2
+    - INSTALLER_TYPE=compass
+    - DEBUG=true
+    - NODE_NAME=${NODE_NAME}
+    - DEPLOY_SCENARIO=${DEPLOY_SCENARIO}
+    - BUILD_TAG=${BUILD_TAG}
+    - BRANCH=$(basename ${BRANCH})