diff options
| author | Doug Szumski <doug@stackhpc.com> | 2018-07-09 17:51:26 +0100 |
|---|---|---|
| committer | Doug Szumski <doug@stackhpc.com> | 2018-07-11 13:56:47 +0000 |
| commit | 72f85b422635fc8ff6420549efe474c5ab6d1c05 (patch) | |
| tree | b3560877b513c9e63262228ec252173bb8c0fa3c /docker | |
| parent | 932f31593a5d94c3650173d9e081d09ed4266227 (diff) | |
| download | kolla-72f85b422635fc8ff6420549efe474c5ab6d1c05.tar.gz kolla-72f85b422635fc8ff6420549efe474c5ab6d1c05.zip | |
Add support for building Logstash
Add support for building Logstash 5.x for both Centos
and Debian based x86 distros.
Partially-Implements: blueprint monasca-containers
Change-Id: I4e2422d1cd2ae4c1f4aa63e8e543e725a1dc840c
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/sources.list.ubuntu | 2 | ||||
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 44 | ||||
| -rw-r--r-- | docker/logstash/extend_start.sh | 8 |
3 files changed, 53 insertions, 1 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index b999624fe..54240fc2f 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -12,7 +12,7 @@ deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe # are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main -# Elastic & kibana repo +# Elasticsearch, Logstash & Kibana repo deb https://artifacts.elastic.co/packages/5.x/apt stable main # InfluxDB repo diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 new file mode 100644 index 000000000..2bb268467 --- /dev/null +++ b/docker/logstash/Dockerfile.j2 @@ -0,0 +1,44 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block logstash_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='logstash', shell='/bin/bash', homedir='/usr/share/logstash') }} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set logstash_packages = [ + 'logstash', + 'java-1.8.0-openjdk-headless' + ] %} + +ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ + +{% elif base_distro in ['debian', 'ubuntu'] %} + {% set logstash_packages = [ + 'logstash', + 'openjdk-8-jre-headless' + ] %} + +{% if base_arch == 'x86_64' %} +ARG java_arch=amd64 +{% elif base_arch == 'aarch64' %} +ARG java_arch=arm64 +{% else %} +ARG java_arch={{ base_arch }} +{% endif %} + +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-${java_arch}/ + +{% endif %} + +{{ macros.install_packages(logstash_packages | customizable("packages")) }} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{% block logstash_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER logstash diff --git a/docker/logstash/extend_start.sh b/docker/logstash/extend_start.sh new file mode 100644 index 000000000..99152b1b5 --- /dev/null +++ b/docker/logstash/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/logstash" ]]; then + mkdir -p /var/log/kolla/logstash +fi +if [[ $(stat -c %a /var/log/kolla/logstash) != "755" ]]; then + chmod 755 /var/log/kolla/logstash +fi |
