x
/
loci-neutron
Code Issues Proposed changes

Use master loci branch for scripts 

Change-Id: I6c7aeac7eb7dcfa01c58c1b6a3f684eb2fef18f3
Depends-On: I5b7802ff0a11be2eb375eb34a3bb553f0b7ae6c4
This commit is contained in:
Sam Yaple 2017-04-04 23:23:39 +00:00
parent ad742ff023
commit 3f5a685b5d
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,16 +7,19 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT}
ARG GIT_REF ARG GIT_REF
ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT} 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 ARG OVERRIDE=override
ADD $OVERRIDE / ADD $OVERRIDE /
RUN set -x \ RUN set -x \
&& yum install --setopt=tsflags=nodocs -y python curl \ && yum install --setopt=tsflags=nodocs -y python curl git \
&& curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \ && git init /tmp/common/ \
&& /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \ && git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_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 \ && yum install --setopt=tsflags=nodocs -y \
bridge-utils \ bridge-utils \
conntrack-tools \ conntrack-tools \
@ -27,4 +30,4 @@ RUN set -x \
keepalived \ keepalived \
openvswitch \ openvswitch \
uuid \ uuid \
&& /tmp/cleanup.sh && /tmp/common/scripts/cleanup.sh

15
debian/Dockerfile vendored
View File

@ -7,17 +7,20 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT}
ARG GIT_REF ARG GIT_REF
ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT} 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 ARG OVERRIDE=override
ADD $OVERRIDE / ADD $OVERRIDE /
RUN set -x \ RUN set -x \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends python ca-certificates curl \ && apt-get install -y --no-install-recommends python ca-certificates curl git \
&& curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \ && git init /tmp/common/ \
&& /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \ && git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_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 \ && apt-get install -y --no-install-recommends \
bridge-utils \ bridge-utils \
conntrack \ conntrack \
@ -31,4 +34,4 @@ RUN set -x \
keepalived \ keepalived \
openvswitch-switch \ openvswitch-switch \
uuid-runtime \ uuid-runtime \
&& /tmp/cleanup.sh && /tmp/common/scripts/cleanup.sh

15
ubuntu/Dockerfile
View File

@ -7,17 +7,20 @@ ARG WHEELS
ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG GIT_REPO=https://git.openstack.org/openstack/${PROJECT}
ARG GIT_REF ARG GIT_REF
ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT} 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 ARG OVERRIDE=override
ADD $OVERRIDE / ADD $OVERRIDE /
RUN set -x \ RUN set -x \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends python ca-certificates curl \ && apt-get install -y --no-install-recommends python ca-certificates curl git \
&& curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \ && git init /tmp/common/ \
&& /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \ && git --git-dir /tmp/common/.git fetch --depth 1 $SCRIPTS_REPO $SCRIPTS_REF \
&& /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_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 \ && apt-get install -y --no-install-recommends \
bridge-utils \ bridge-utils \
conntrack \ conntrack \
@ -31,4 +34,4 @@ RUN set -x \
keepalived \ keepalived \
openvswitch-switch \ openvswitch-switch \
uuid-runtime \ uuid-runtime \
&& /tmp/cleanup.sh && /tmp/common/scripts/cleanup.sh