Merge pull request #21 from yaodu/remove_venv

Removed venv and pip
2017-01-14 00:26:18 +00:00 · 2017-01-14 00:26:18 +00:00 · fbb72cdc13
parent e8e57a8649 612c0a57ed
commit fbb72cdc13
4 changed files with 22 additions and 37 deletions
--- a/dockerfiles/Dockerfile-centos
+++ b/dockerfiles/Dockerfile-centos
@ -1,7 +1,6 @@
 FROM centos:7

-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=keystone
+ENV PROJECT=keystone
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=centos
 ARG WHEELS
@ -38,27 +37,23 @@ RUN set -x \
    && 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 \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt \
        pymysql \
        python-memcached \
        uwsgi \
    && sed -i 's/^Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \
    && rm /etc/httpd/conf.d/* \
-    && cp /virtualenv/bin/keystone-wsgi-* /usr/bin/ \
 # Provide compatibility with older format keystone apache config:
    && mkdir -p /var/www/cgi-bin/keystone \
-    && cp /virtualenv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
-    && cp /virtualenv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
+    && cp /bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
+    && cp /bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
 # Provide compatibility with ubuntu/debian apache:
    && ln -s /usr/sbin/httpd /usr/sbin/apache2 \
    && mkdir -p /etc/apache2/conf-enabled \
@ -71,4 +66,5 @@ RUN set -x \
    && rpm -e --nodeps centos-logos \
    && 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 wheel pip -y \
+    && find / -type f -name "*.pyc" -delete
--- a/dockerfiles/Dockerfile-debian
+++ b/dockerfiles/Dockerfile-debian
@ -1,7 +1,6 @@
 FROM debian:jessie

-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=keystone
+ENV PROJECT=keystone
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=latest
 ARG WHEELS
@ -37,28 +36,25 @@ RUN set -x \
    && 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 \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt \
        pymysql \
        python-memcached \
        uwsgi \
    && rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/* /etc/apache2/sites-available/* \
    && touch /etc/apache2/ports.conf \
-    && cp /virtualenv/bin/keystone-wsgi-* /usr/bin/ \
 # Provide compatibility with older format keystone apache config:
    && mkdir -p /var/www/cgi-bin/keystone \
-    && cp /virtualenv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
-    && cp /virtualenv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
+    && cp /usr/local/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
+    && cp /usr/local/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
 # 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 wheel pip -y \
+    && find / -type f -name "*.pyc" -delete
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@ -1,7 +1,6 @@
 FROM ubuntu:xenial

-ENV PATH=/virtualenv/bin:${PATH} \
-    PROJECT=keystone
+ENV PROJECT=keystone
 ARG DOCKER_REPO=yaodu/openstack-requirements
 ARG DOCKER_TAG=ubuntu
 ARG WHEELS
@ -37,28 +36,25 @@ RUN set -x \
    && 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 \
+    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt \
        pymysql \
        python-memcached \
        uwsgi \
    && rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/* /etc/apache2/sites-available/* \
    && touch /etc/apache2/ports.conf \
-    && cp /virtualenv/bin/keystone-wsgi-* /usr/bin/ \
 # Provide compatibility with older format keystone apache config:
    && mkdir -p /var/www/cgi-bin/keystone \
-    && cp /virtualenv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
-    && cp /virtualenv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
+    && cp /usr/local/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
+    && cp /usr/local/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
 # 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 wheel pip -y \
+    && find / -type f -name "*.pyc" -delete
--- 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\