openstack/kolla
Code Issues Proposed changes

Merge "Add build from source for Magnum"

Browse Source
This commit is contained in:
Jenkins 2015-07-19 11:49:31 +00:00 committed by Gerrit Code Review
commit 6d00f8a64b
15 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/centos/source/magnum/magnum-api/Dockerfile Normal file
View File

@ -0,0 +1,9 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY ./start.sh /start.sh
COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]

1
docker/centos/source/magnum/magnum-api/build Symbolic link
View File

@ -0,0 +1 @@
../../../../../tools/build-docker-image

1
docker/centos/source/magnum/magnum-api/check.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-api/check.sh

1
docker/centos/source/magnum/magnum-api/config-external.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-api/config-external.sh

1
docker/centos/source/magnum/magnum-api/config-internal.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-api/config-internal.sh

1
docker/centos/source/magnum/magnum-api/start.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-api/start.sh

10
docker/centos/source/magnum/magnum-base/.buildinfo Normal file
View File

@ -0,0 +1,10 @@
# Build info specific to this image. All values can be overridden in .buildconf
COMPONENT=magnum
SOURCE_INSTALL_AVAILABLE=1
# Used for git install method
: ${CLONE_FROM:=https://github.com/openstack/magnum}
# Used for curl install method
: ${TARBALL_URI:=http://tarballs.openstack.org/magnum/magnum-2015.1.1.tar.gz}

15
docker/centos/source/magnum/magnum-base/Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./magnum.tar /
RUN ln -s /magnum-* /magnum
RUN cd /magnum \
&& useradd --user-group magnum \
&& pip install -r requirements.txt \
&& pip install /magnum \
&& mkdir /etc/magnum /var/log/magnum \
&& cp -r /magnum/etc/* /etc/magnum/
RUN mkdir -p /opt/kolla
COPY config-magnum.sh /opt/kolla/config-magnum.sh

1
docker/centos/source/magnum/magnum-base/build Symbolic link
View File

@ -0,0 +1 @@
../../../../../tools/build-docker-image

1
docker/centos/source/magnum/magnum-base/config-magnum.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-base/config-magnum.sh

11
docker/centos/source/magnum/magnum-conductor/Dockerfile Normal file
View File

@ -0,0 +1,11 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install kubectl binary (ugh)
RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]

1
docker/centos/source/magnum/magnum-conductor/build Symbolic link
View File

@ -0,0 +1 @@
../../../../../tools/build-docker-image

1
docker/centos/source/magnum/magnum-conductor/config-external.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-conductor/config-external.sh

1
docker/centos/source/magnum/magnum-conductor/config-internal.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-conductor/config-internal.sh

1
docker/centos/source/magnum/magnum-conductor/start.sh Symbolic link
View File

@ -0,0 +1 @@
../../../../common/magnum/magnum-conductor/start.sh