x
/
loci-keystone
Code Issues Proposed changes

Cleanup packages already installed in scripts 

Change-Id: I27634d47d948884315a5df642c484e2588f58315
This commit is contained in:
Paul Bourke 2017-04-12 10:19:12 +01:00
parent 99c7a6d7cd
commit 870fcc143e
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
centos/Dockerfile
View File

@ -13,14 +13,13 @@ ARG OVERRIDE=override
ADD $OVERRIDE /
RUN set -x \
&& yum install -y python curl git \
&& yum install -y git \
httpd \
mod_ssl \
mod_wsgi \
&& git init /tmp/common/ \
&& git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& git --work-tree /tmp/common --git-dir /tmp/common/.git checkout FETCH_HEAD \
&& /tmp/common/scripts/download.sh \
&& /tmp/common/scripts/install.sh \
&& yum install -y \
httpd \
mod_ssl \
mod_wsgi \
&& /tmp/common/scripts/cleanup.sh

7
debian/Dockerfile vendored
View File

@ -14,13 +14,12 @@ ADD $OVERRIDE /
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates curl git \
&& apt-get install -y --no-install-recommends git \
apache2 \
libapache2-mod-wsgi \
&& git init /tmp/common/ \
&& git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& git --work-tree /tmp/common --git-dir /tmp/common/.git checkout FETCH_HEAD \
&& /tmp/common/scripts/download.sh \
&& /tmp/common/scripts/install.sh \
&& apt-get install -y --no-install-recommends \
apache2 \
libapache2-mod-wsgi \
&& /tmp/common/scripts/cleanup.sh

7
ubuntu/Dockerfile
View File

@ -14,13 +14,12 @@ ADD $OVERRIDE /
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates curl git \
&& apt-get install -y --no-install-recommends git \
apache2 \
libapache2-mod-wsgi \
&& git init /tmp/common/ \
&& git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& git --work-tree /tmp/common --git-dir /tmp/common/.git checkout FETCH_HEAD \
&& /tmp/common/scripts/download.sh \
&& /tmp/common/scripts/install.sh \
&& apt-get install -y --no-install-recommends \
apache2 \
libapache2-mod-wsgi \
&& /tmp/common/scripts/cleanup.sh