Use master loci branch for scripts
Change-Id: Ief51539f4830d80ad02e21906258bd738d7108a4 Depends-On: I5b7802ff0a11be2eb375eb34a3bb553f0b7ae6c4
This commit is contained in:
parent
44a0b7ed10
commit
a712e542c8
|
@ -7,18 +7,21 @@ 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 \
|
||||
&& 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 \
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
httpd \
|
||||
mod_ssl \
|
||||
mod_wsgi \
|
||||
&& /tmp/cleanup.sh
|
||||
&& /tmp/common/scripts/cleanup.sh
|
||||
|
|
|
@ -7,18 +7,21 @@ 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 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 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 \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apache2 \
|
||||
libapache2-mod-wsgi \
|
||||
&& /tmp/cleanup.sh
|
||||
&& /tmp/common/scripts/cleanup.sh
|
||||
|
|
|
@ -7,18 +7,21 @@ 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 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 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 \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apache2 \
|
||||
libapache2-mod-wsgi \
|
||||
&& /tmp/cleanup.sh
|
||||
&& /tmp/common/scripts/cleanup.sh
|
||||
|
|
Loading…
Reference in New Issue