From 2dae2f080ca814cfc6c753159540a74778ad1c33 Mon Sep 17 00:00:00 2001 From: caowei Date: Tue, 8 Nov 2016 22:57:51 +0800 Subject: Add karbor container Change-Id: I8ed8840d06a1fdb87aad51f438ac6c38c1c14642 Partially-implements: bp karbor-container --- docker/karbor/karbor-api/Dockerfile.j2 | 20 +++++++++++++++ docker/karbor/karbor-api/extend_start.sh | 8 ++++++ docker/karbor/karbor-base/Dockerfile.j2 | 29 ++++++++++++++++++++++ docker/karbor/karbor-base/extend_start.sh | 10 ++++++++ docker/karbor/karbor-operationengine/Dockerfile.j2 | 17 +++++++++++++ docker/karbor/karbor-protection/Dockerfile.j2 | 17 +++++++++++++ 6 files changed, 101 insertions(+) create mode 100644 docker/karbor/karbor-api/Dockerfile.j2 create mode 100644 docker/karbor/karbor-api/extend_start.sh create mode 100644 docker/karbor/karbor-base/Dockerfile.j2 create mode 100644 docker/karbor/karbor-base/extend_start.sh create mode 100644 docker/karbor/karbor-operationengine/Dockerfile.j2 create mode 100644 docker/karbor/karbor-protection/Dockerfile.j2 (limited to 'docker') diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 new file mode 100644 index 000000000..d8bbe7818 --- /dev/null +++ b/docker/karbor/karbor-api/Dockerfile.j2 @@ -0,0 +1,20 @@ +FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block karbor_api_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_karbor_extend_start +RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start + +{% block karbor_api_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER karbor diff --git a/docker/karbor/karbor-api/extend_start.sh b/docker/karbor/karbor-api/extend_start.sh new file mode 100644 index 000000000..c5102072e --- /dev/null +++ b/docker/karbor/karbor-api/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + karbor-manage db sync + exit 0 +fi diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 new file mode 100644 index 000000000..26484070f --- /dev/null +++ b/docker/karbor/karbor-base/Dockerfile.j2 @@ -0,0 +1,29 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block karbor_base_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD karbor-base-archive /karbor-base-source +RUN ln -s karbor-base-source/* karbor \ + && useradd --user-group --create-home --home-dir /var/lib/karbor karbor \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /karbor \ + && mkdir -p /etc/karbor \ + && cp -r /karbor/etc/* /etc/karbor/ \ + && chown -R karbor: /etc/karbor + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla karbor \ + && touch /usr/local/bin/kolla_karbor_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_karbor_extend_start + +{% block karbor_base_footer %}{% endblock %} diff --git a/docker/karbor/karbor-base/extend_start.sh b/docker/karbor/karbor-base/extend_start.sh new file mode 100644 index 000000000..db0fdacc8 --- /dev/null +++ b/docker/karbor/karbor-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/karbor" ]]; then + mkdir -p /var/log/kolla/karbor +fi +if [[ $(stat -c %a /var/log/kolla/karbor) != "755" ]]; then + chmod 755 /var/log/kolla/karbor +fi + +. /usr/local/bin/kolla_karbor_extend_start diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 new file mode 100644 index 000000000..745fcd4a8 --- /dev/null +++ b/docker/karbor/karbor-operationengine/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block karbor_operationengine_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block karbor_operationengine_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER karbor diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 new file mode 100644 index 000000000..9be5cca0b --- /dev/null +++ b/docker/karbor/karbor-protection/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block karbor_protection_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block karbor_protection_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER karbor -- cgit v1.2.3