x
/
loci-nova
Code Issues Proposed changes

Use master loci branch for scripts 

Change-Id: I5d30353f42d41e0044a4c32f15c1e5a5283f7e6e
Depends-On: I5b7802ff0a11be2eb375eb34a3bb553f0b7ae6c4
This commit is contained in:
Sam Yaple 2017-04-04 23:23:47 +00:00
parent b9972ecb93
commit 1e2f894ef0
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
centos/Dockerfile
View File

@ -7,14 +7,17 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/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.2.tar.gz
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=override
ADD $OVERRIDE /
RUN set -x \
&& yum install --setopt=tsflags=nodocs -y python 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 \
&& /tmp/cleanup.sh
&& yum install --setopt=tsflags=nodocs -y python curl git \
&& 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 \
&& /tmp/common/scripts/cleanup.sh

15
debian/Dockerfile vendored
View File

@ -7,15 +7,18 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/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.2.tar.gz
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=override
ADD $OVERRIDE /
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 \
&& /tmp/cleanup.sh
&& apt-get install -y --no-install-recommends python ca-certificates curl git \
&& 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 \
&& /tmp/common/scripts/cleanup.sh

15
ubuntu/Dockerfile
View File

@ -7,15 +7,18 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/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.2.tar.gz
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=override
ADD $OVERRIDE /
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 \
&& /tmp/cleanup.sh
&& apt-get install -y --no-install-recommends python ca-certificates curl git \
&& 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 \
&& /tmp/common/scripts/cleanup.sh