From 370ea64a90d288c2dba94a849cdea87b0f82b0a3 Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Thu, 12 Jan 2017 14:59:45 +0800
Subject: [PATCH] Update Dockerfile

- update OS version to 16.04
- update pip version

JIRA: QTIP-202

Change-Id: Iba90e4b354f2ddb9e1cbc1da191be6b1b6f6a042
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 {legacy/docker => docker}/Dockerfile          | 47 +++++++++++++--------------
 {legacy/docker => docker}/ansible.cfg.default |  0
 {legacy/docker => docker}/supervisord.conf    |  0
 3 files changed, 22 insertions(+), 25 deletions(-)
 rename {legacy/docker => docker}/Dockerfile (74%)
 rename {legacy/docker => docker}/ansible.cfg.default (100%)
 rename {legacy/docker => docker}/supervisord.conf (100%)

diff --git a/legacy/docker/Dockerfile b/docker/Dockerfile
similarity index 74%
rename from legacy/docker/Dockerfile
rename to docker/Dockerfile
index 369fa6c8..f2a543e6 100644
--- a/legacy/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,7 @@
 #####Docker container for QTIP############
 ##########################################
 
-
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER Yujun Zhang <zhang.yujunz@zte.com.cn>
 LABEL version="0.1" description="OPNFV QTIP Docker container"
 
@@ -17,31 +16,31 @@ WORKDIR /home/opnfv
 
 # Packaged Dependencies
 RUN apt-get update && apt-get install -y \
-software-properties-common \
-wget \
-git \
-gcc \
-ssh \
-expect \
-python-matplotlib \
-python-dev \
-python-pip \
-libjpeg62 \
-libjpeg62-dev \
-zlib1g-dev \
-python-tk \
-curl \
-supervisor \
-python-setuptools \
---no-install-recommends
-
+    software-properties-common \
+    wget \
+    git \
+    gcc \
+    ssh \
+    expect \
+    python-matplotlib \
+    python-dev \
+    python-pip \
+    libjpeg62 \
+    libjpeg62-dev \
+    zlib1g-dev \
+    python-tk \
+    curl \
+    supervisor \
+    python-setuptools \
+    --no-install-recommends \
+&& rm -rf /var/lib/apt/lists/*
+
+RUN pip install -U pip
 RUN pip install 'setuptools>=17.1'
 
 RUN apt-add-repository ppa:ansible/ansible -y
 RUN apt-key update -y
-RUN apt-get update -y
-RUN apt-get install ansible --force-yes -y
-
+RUN apt-get update && apt-get install ansible -y
 
 RUN mkdir -p ${REPOS_DIR}
 RUN mkdir -p /root/.ssh
@@ -54,7 +53,6 @@ RUN chmod 700 /root/.ssh
 COPY ansible.cfg.default /root/.ansible.cfg
 
 #Cloning Repos
-
 RUN git config --global http.sslVerify false
 RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip
 RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng
@@ -62,7 +60,6 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng
 RUN pip install -r $REPOS_DIR/qtip/requirements.txt
 
 #Config supervisor
-
 RUN mkdir -p /var/log/supervisor
 RUN locale-gen en_US en_US.UTF-8
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
diff --git a/legacy/docker/ansible.cfg.default b/docker/ansible.cfg.default
similarity index 100%
rename from legacy/docker/ansible.cfg.default
rename to docker/ansible.cfg.default
diff --git a/legacy/docker/supervisord.conf b/docker/supervisord.conf
similarity index 100%
rename from legacy/docker/supervisord.conf
rename to docker/supervisord.conf
-- 
2.16.6