From 2ab09e333bf9763cb65d348958f191b19eff0ac9 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sat, 14 Jan 2017 00:58:50 +0000
Subject: [PATCH] Remove venv

---
 dockerfiles/Dockerfile-centos | 15 ++++++---------
 dockerfiles/Dockerfile-debian | 15 ++++++---------
 dockerfiles/Dockerfile-ubuntu | 15 ++++++---------
 update.sh                     |  5 +----
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/dockerfiles/Dockerfile-centos b/dockerfiles/Dockerfile-centos
index aedd045..f37f2ee 100644
--- a/dockerfiles/Dockerfile-centos
+++ b/dockerfiles/Dockerfile-centos
@@ -1,7 +1,6 @@
 FROM centos:7
 
-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=neutron \
+ENV PROJECT=neutron \
     OPENSTACK_RPMS_VERSION=newton
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=centos
@@ -48,20 +47,17 @@ RUN set -x \
        fi \
     && mkdir /tmp/packages \
     && tar xf /tmp/wheels.tar.gz -C /tmp/packages/ --strip-components=2 root/packages \
-    && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py \
-    && pip install virtualenv \
-    && virtualenv /virtualenv \
-    && hash -r \
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
     && groupadd -g 42424 ${PROJECT} \
     && useradd -u 42424 -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} \
     && mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
     && chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
 # common install end
 # Project specific command block start
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
 # Setup config file structure
     && ( cd /tmp/${PROJECT} && ./tools/generate_config_file_samples.sh ) \
     && mv /tmp/${PROJECT}/etc/neutron.conf.sample /tmp/${PROJECT}/etc/neutron.conf \
@@ -81,4 +77,5 @@ RUN set -x \
     && yum history -y undo $(yum history list git | tail -2 | head -1 | awk '{ print $1}') \
     && yum clean all \
     && rm -rf /tmp/* /root/.cache \
-    && find / -type f \( -name "*.pyc" -o -name "pip" -o -name "easy_install" -o -name "wheel" \) -delete
+    && pip uninstall pip wheel -y \
+    && find / -type f -name "*.pyc" -delete
diff --git a/dockerfiles/Dockerfile-debian b/dockerfiles/Dockerfile-debian
index 99d05dd..4075972 100644
--- a/dockerfiles/Dockerfile-debian
+++ b/dockerfiles/Dockerfile-debian
@@ -1,7 +1,6 @@
 FROM debian:jessie
 
-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=neutron
+ENV PROJECT=neutron
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=latest
 ARG WHEELS
@@ -46,20 +45,17 @@ RUN set -x \
        fi \
     && mkdir /tmp/packages \
     && tar xf /tmp/wheels.tar.gz -C /tmp/packages/ --strip-components=2 root/packages \
-    && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py \
-    && pip install virtualenv \
-    && virtualenv /virtualenv \
-    && hash -r \
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
     && groupadd -g 42424 ${PROJECT} \
     && useradd -u 42424 -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} \
     && mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
     && chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
 # common install end
 # Project specific command block start
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
 # Setup config file structure
     && ( cd /tmp/${PROJECT} && ./tools/generate_config_file_samples.sh ) \
     && mv /tmp/${PROJECT}/etc/neutron.conf.sample /tmp/${PROJECT}/etc/neutron.conf \
@@ -78,4 +74,5 @@ RUN set -x \
 # Project specific command block end
     && apt-get purge -y --auto-remove ca-certificates curl git \
     && rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache \
-    && find / -type f \( -name "*.pyc" -o -name "pip" -o -name "easy_install" -o -name "wheel" \) -delete
+    && pip uninstall pip wheel -y \
+    && find / -type f -name "*.pyc" -delete
diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu
index 67a88c2..e5a152d 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@@ -1,7 +1,6 @@
 FROM ubuntu:xenial
 
-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=neutron
+ENV PROJECT=neutron
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=ubuntu
 ARG WHEELS
@@ -46,20 +45,17 @@ RUN set -x \
        fi \
     && mkdir /tmp/packages \
     && tar xf /tmp/wheels.tar.gz -C /tmp/packages/ --strip-components=2 root/packages \
-    && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py \
-    && pip install virtualenv \
-    && virtualenv /virtualenv \
-    && hash -r \
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \
     && groupadd -g 42424 ${PROJECT} \
     && useradd -u 42424 -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} \
     && mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
     && chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \
 # common install end
 # Project specific command block start
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt python-memcached pymysql \
 # Setup config file structure
     && ( cd /tmp/${PROJECT} && ./tools/generate_config_file_samples.sh ) \
     && mv /tmp/${PROJECT}/etc/neutron.conf.sample /tmp/${PROJECT}/etc/neutron.conf \
@@ -78,4 +74,5 @@ RUN set -x \
 # Project specific command block end
     && apt-get purge -y --auto-remove ca-certificates curl git \
     && rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache \
-    && find / -type f \( -name "*.pyc" -o -name "pip" -o -name "easy_install" -o -name "wheel" \) -delete
+    && pip uninstall pip wheel -y \
+    && find / -type f -name "*.pyc" -delete
diff --git a/update.sh b/update.sh
index 54c61f3..2fc69dd 100755
--- a/update.sh
+++ b/update.sh
@@ -24,10 +24,7 @@ COMMON_INSTALL=$(cat <<'END_HEREDOC'
     && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \\\n\
     && python get-pip.py \\\n\
     && rm get-pip.py \\\n\
-    && pip install virtualenv \\\n\
-    && virtualenv /virtualenv \\\n\
-    && hash -r \\\n\
-    && pip install --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \\\n\
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt /tmp/${PROJECT} \\\n\
     && groupadd -g 42424 ${PROJECT} \\\n\
     && useradd -u 42424 -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} \\\n\
     && mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} \\\n\