diff options
| author |   Ace Lee <liyin11@huawei.com> | 2017-11-03 06:39:00 +0000 |
|---|---|---|
| committer | Ace Lee <liyin11@huawei.com> | 2017-11-17 02:17:29 +0000 |
| commit | 7f0f1eaf717f7016d2f9ec5328cf9a0d02104222 (patch) | |
| tree | fab051cf9b321b2c95694643d0a846791c7779dd /docker | |
| parent | 8291c3d11227de42599be920605f3f884dfa755b (diff) | |
update docker version to 16.04
JIRA: YARDSTICK-690
This patch is for Yardstick Docker base image upgrade to 16.04
This patch will enable ansible build image in yardstick env prepare.
Add qemu-img convert to ansible build image.
Change-Id: I43127b6020bd20bd9f4aac4fca0df75353b24346
Signed-off-by: Ace Lee <liyin11@huawei.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b48a550bf..0c6e804a8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,22 +7,22 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL image=opnfv/yardstick ARG BRANCH=master # GIT repo directory -ENV REPOS_DIR /home/opnfv/repos -ENV IMAGE_DIR /home/opnfv/images/ +ENV REPOS_DIR="/home/opnfv/repos" \ + IMAGE_DIR="/home/opnfv/images/" # Set work directory # Yardstick repo -ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick -ENV RELENG_REPO_DIR ${REPOS_DIR}/releng -ENV STORPERF_REPO_DIR ${REPOS_DIR}/storperf +ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \ + RELENG_REPO_DIR="${REPOS_DIR}/releng" \ + STORPERF_REPO_DIR="${REPOS_DIR}/storperf" RUN apt-get update && apt-get install -y git python-setuptools python-pip RUN easy_install -U setuptools==30.0.0 |