diff options
| author |   liyin <liyin11@huawei.com> | 2016-12-06 16:52:39 +0800 |
|---|---|---|
| committer | liyin <liyin11@huawei.com> | 2016-12-06 16:52:39 +0800 |
| commit | c4a53bacf10ac556a0e6a355f0ead2cb4d6939b8 (patch) | |
| tree | 38ee9d7a1913d5642808d8b126a45105c71c5e6c /docker | |
| parent | 165db3dbc632275f49261a69760867b811b0520b (diff) | |
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>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bottleneck-compose/docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/bottleneck-compose/yardstick/Dockerfile | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/docker/bottleneck-compose/docker-compose.yml b/docker/bottleneck-compose/docker-compose.yml index 99ff1f6e..b6e8b3d0 100644 --- 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 index e7e44f0d..00000000 --- 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"] |