Merge "venus: add log management system"

4 files changed, 63 insertions, 0 deletions

diff --git a/docker/venus/venus-api/Dockerfile.j2 b/docker/venus/venus-api/Dockerfile.j2
new file mode 100644
index 000000000..a10e55535
--- /dev/null
+++ b/docker/venus/venus-api/Dockerfile.j2
@@ -0,0 +1,11 @@
+FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block venus_api_header %}{% endblock %}
+
+{% block venus_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER venus
diff --git a/docker/venus/venus-base/Dockerfile.j2 b/docker/venus/venus-base/Dockerfile.j2
new file mode 100644
index 000000000..9f95a4963
--- /dev/null
+++ b/docker/venus/venus-base/Dockerfile.j2
@@ -0,0 +1,29 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block venus_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='venus') }}
+
+ADD venus-base-archive /venus-base-source
+
+{% set venus_base_pip_packages = [
+    '/venus'
+] %}
+
+RUN ln -s venus-base-source/* venus \
+    && {{ macros.install_pip(venus_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/venus \
+    && cp -r /venus/etc/venus/* /etc/venus/ \
+    && chown -R venus: /etc/venus
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN touch /usr/local/bin/kolla_venus_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start
+
+{% block venus_base_footer %}{% endblock %}
diff --git a/docker/venus/venus-base/extend_start.sh b/docker/venus/venus-base/extend_start.sh
new file mode 100644
index 000000000..fa7bbe54b
--- /dev/null
+++ b/docker/venus/venus-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/venus" ]]; then
+    mkdir -p /var/log/kolla/venus
+fi
+if [[ $(stat -c %a /var/log/kolla/venus) != "755" ]]; then
+    chmod 755 /var/log/kolla/venus
+fi
+
+. /usr/local/bin/kolla_venus_extend_start
diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2
new file mode 100644
index 000000000..a15b6c92b
--- /dev/null
+++ b/docker/venus/venus-manager/Dockerfile.j2
@@ -0,0 +1,13 @@
+FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block venus_manager_header %}{% endblock %}
+
+RUN chmod 755 /usr/local/bin/kolla_venus_extend_start
+
+{% block venus_manager_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER venus