x
/
loci-glance
Code Issues Proposed changes

Use master loci branch for scripts 

Change-Id: Icfbaae07231c227924342dbb99cd3f40d2c4cefc
This commit is contained in:
Sam Yaple 2017-04-04 19:29:52 +00:00
parent 2811781b89
commit 401b2e0928
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
centos/Dockerfile
View File

@ -7,15 +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_REF=0.1.2
ARG SCRIPTS_REPO=https://github.com/yaodu/common/
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=empty
ADD $OVERRIDE /
RUN set -x \
&& yum install --setopt=tsflags=nodocs -y python curl git \
&& git clone --branch $SCRIPTS_REF --depth 1 $SCRIPTS_REPO /tmp/common \
&& 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 $DOCKER_REPO $DOCKER_TAG $WHEELS \
&& /tmp/common/scripts/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
&& /tmp/common/scripts/cleanup.sh

8
debian/Dockerfile vendored
View File

@ -7,8 +7,8 @@ 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_REF=0.1.2
ARG SCRIPTS_REPO=https://github.com/yaodu/common/
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=empty
ADD $OVERRIDE /
@ -16,7 +16,9 @@ ADD $OVERRIDE /
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends python ca-certificates curl git \
&& git clone --branch $SCRIPTS_REF --depth 1 $SCRIPTS_REPO /tmp/common \
&& 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 $DOCKER_REPO $DOCKER_TAG $WHEELS \
&& /tmp/common/scripts/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
&& /tmp/common/scripts/cleanup.sh

8
ubuntu/Dockerfile
View File

@ -7,8 +7,8 @@ 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_REF=0.1.2
ARG SCRIPTS_REPO=https://github.com/yaodu/common/
ARG SCRIPTS_REPO=https://github.com/openstack/loci
ARG SCRIPTS_REF=master
ARG OVERRIDE=empty
ADD $OVERRIDE /
@ -16,7 +16,9 @@ ADD $OVERRIDE /
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends python ca-certificates curl git \
&& git clone --branch $SCRIPTS_REF --depth 1 $SCRIPTS_REPO /tmp/common \
&& 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 $DOCKER_REPO $DOCKER_TAG $WHEELS \
&& /tmp/common/scripts/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \
&& /tmp/common/scripts/cleanup.sh