summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-11-20 08:57:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-20 08:57:01 +0000
commitb77826de37bde8683f15bd758951dfaf8af6402d (patch)
tree13bbc3417e935a620a2d6835f2cf048cb0021f09 /docker/Dockerfile
parent31b02e5b95d8b4076ef60667d051a8a1a6b072ba (diff)
parent7f0f1eaf717f7016d2f9ec5328cf9a0d02104222 (diff)
Merge "update docker version to 16.04"
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a58bbbc7b..4ec6791e7 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 && apt-get -y autoremove && apt-get clean
RUN easy_install -U setuptools==30.0.0