diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/bottleneck-compose/docker-compose.yml | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 7e7793ee..fc3451ba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y \ python \ python-dev \ python-pip \ + vim \ python-setuptools && \ easy_install -U setuptools==30.0.0 @@ -50,3 +51,4 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} RUN easy_install pytz RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt +RUN pip install -U /home/opnfv/bottlenecks diff --git a/docker/bottleneck-compose/docker-compose.yml b/docker/bottleneck-compose/docker-compose.yml index b6e8b3d0..6dbf8999 100644 --- a/docker/bottleneck-compose/docker-compose.yml +++ b/docker/bottleneck-compose/docker-compose.yml @@ -19,9 +19,20 @@ yardstick: image: opnfv/yardstick:latest volumes: - /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/ + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /tmp/:/tmp/ + environment: + - INSTALLER_IP=192.168.200.2 + - INSTALLER_TYPE=compass |