docker-compose yardstick file change

JIRA: BOTTLENECK-117

This patch change the docker-compose file.
because of yardstick dockerfile.
so bottlenecks also need to change the style of docker-compose.

Change-Id: Idb82120c5b00ef8595a993886fa3fc0d6b6c4c32
Signed-off-by: liyin <liyin11@huawei.com>

diff --git a/docker/bottleneck-compose/docker-compose.yml b/docker/bottleneck-compose/docker-compose.yml
index 99ff1f6..b6e8b3d 100644 (file)
--- a/docker/bottleneck-compose/docker-compose.yml
+++ b/docker/bottleneck-compose/docker-compose.yml
@@ -16,7 +16,7 @@ kibana:
 
 yardstick:
   restart: always
-  build: yardstick/
+  image: opnfv/yardstick:latest
   volumes:
     - /var/run/docker.sock:/var/run/docker.sock
   ports:

diff --git a/docker/bottleneck-compose/yardstick/Dockerfile b/docker/bottleneck-compose/yardstick/Dockerfile
deleted file mode 100644 (file)
index e7e44f0..0000000
--- a/docker/bottleneck-compose/yardstick/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM opnfv/yardstick:latest
-
-USER root
-
-RUN apt-get update && apt-get install -y \
-    openssh-server
-
-# Create dir to put yardstick configure file
-RUN mkdir /var/run/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]