From: Ross Brattain <ross.b.brattain@intel.com>
Date: Mon, 20 Nov 2017 08:57:01 +0000 (+0000)
Subject: Merge "update docker version to 16.04"
X-Git-Tag: opnfv-6.0.0~270
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b77826de37bde8683f15bd758951dfaf8af6402d;p=yardstick.git

Merge "update docker version to 16.04"
---

b77826de37bde8683f15bd758951dfaf8af6402d
diff --cc docker/Dockerfile
index a58bbbc7b,0c6e804a8..4ec6791e7
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -20,11 -20,11 +20,11 @@@ ENV REPOS_DIR="/home/opnfv/repos" 
  # 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 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
  RUN pip install appdirs==1.4.0