x
/
loci-keystone
Code Issues Proposed changes

Update locations and common version (#23) 

* Move dockerfiles to own folders

This is required for DockerHub building

* Switch to 0.1.1 common
This commit is contained in:
Sam Yaple 2017-03-22 16:57:12 +00:00 committed by GitHub
parent 7cc7d64121
commit 8e503e3d59
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dockerfiles/Dockerfile-centos → centos/Dockerfile
View File

11
dockerfiles/Dockerfile-debian → debian/Dockerfile vendored
View File

@ -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

10
dockerfiles/Dockerfile-ubuntu → ubuntu/Dockerfile
View File

@ -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