From 8e503e3d59e5ab007b5200f53deab63ed0867e2b Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 22 Mar 2017 16:57:12 +0000
Subject: [PATCH] Update locations and common version (#23)

* Move dockerfiles to own folders

This is required for DockerHub building

* Switch to 0.1.1 common
---
 dockerfiles/Dockerfile-centos => centos/Dockerfile |  0
 dockerfiles/Dockerfile-debian => debian/Dockerfile | 11 +++++------
 dockerfiles/Dockerfile-ubuntu => ubuntu/Dockerfile | 10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename dockerfiles/Dockerfile-centos => centos/Dockerfile (100%)
 rename dockerfiles/Dockerfile-debian => debian/Dockerfile (72%)
 rename dockerfiles/Dockerfile-ubuntu => ubuntu/Dockerfile (67%)

diff --git a/dockerfiles/Dockerfile-centos b/centos/Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile-centos
rename to centos/Dockerfile
diff --git a/dockerfiles/Dockerfile-debian b/debian/Dockerfile
similarity index 72%
rename from dockerfiles/Dockerfile-debian
rename to debian/Dockerfile
index 9dff79a..fccfbcd 100644
--- a/dockerfiles/Dockerfile-debian
+++ b/debian/Dockerfile
@@ -7,18 +7,17 @@ ARG WHEELS
 ARG GIT_REPO=https://github.com/openstack/${PROJECT}
 ARG GIT_REF
 ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT}
-ARG SCRIPTS=https://github.com/yaodu/common/archive/0.1.0.tar.gz
+ARG SCRIPTS=https://github.com/yaodu/common/archive/0.1.1.tar.gz
 
 RUN set -x \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        apache2 \
-        libapache2-mod-wsgi \
-    && apt-get install -y --no-install-recommends ca-certificates curl \
+    && apt-get install -y --no-install-recommends python ca-certificates curl \
     && curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \
     && /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \
     && /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
-    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt uwsgi \
+    && apt-get install -y --no-install-recommends \
+        apache2 \
+        libapache2-mod-wsgi \
     && rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/* /etc/apache2/sites-available/* \
     && touch /etc/apache2/ports.conf \
     && /tmp/cleanup.sh
diff --git a/dockerfiles/Dockerfile-ubuntu b/ubuntu/Dockerfile
similarity index 67%
rename from dockerfiles/Dockerfile-ubuntu
rename to ubuntu/Dockerfile
index 01a3443..8c1a965 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/ubuntu/Dockerfile
@@ -7,17 +7,17 @@ ARG WHEELS
 ARG GIT_REPO=https://github.com/openstack/${PROJECT}
 ARG GIT_REF
 ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT}
+ARG SCRIPTS=https://github.com/yaodu/common/archive/0.1.1.tar.gz
 
 RUN set -x \
     && apt-get update \
+    && apt-get install -y --no-install-recommends python ca-certificates curl \
+    && curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \
+    && /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \
+    && /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
     && apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-wsgi \
-    && apt-get install -y --no-install-recommends ca-certificates curl \
-    && curl -sSL https://github.com/yaodu/common/archive/0.1.0.tar.gz | tar xz -C /tmp/ --strip-components=2 \
-    && /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \
-    && /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
-    && pip install --no-cache-dir --no-index --no-compile --find-links /tmp/packages --constraint /tmp/packages/upper-constraints.txt uwsgi \
     && rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/* /etc/apache2/sites-available/* \
     && touch /etc/apache2/ports.conf \
     && /tmp/cleanup.sh