modernize

This commit is contained in:
dave 2018-08-18 18:48:52 -07:00
parent 6ab3b20bf0
commit 6f90452128
4 changed files with 14 additions and 21 deletions

View File

@ -1,18 +1,18 @@
FROM ubuntu:trusty
FROM ubuntu:bionic
RUN apt-get update && \
apt-get install -y curl supervisor && \
mkdir /opt/kibana && \
curl -o /tmp/kibana.tar.gz https://artifacts.elastic.co/downloads/kibana/kibana-5.3.1-linux-x86_64.tar.gz && \
apt-get install -y wget && \
rm -rf /var/lib/apt/lists/*
RUN mkdir /opt/kibana && \
wget -qO /tmp/kibana.tar.gz https://artifacts.elastic.co/downloads/kibana/kibana-6.3.2-linux-x86_64.tar.gz && \
tar -C /opt/kibana/ -zxvf /tmp/kibana.tar.gz --strip-components=1 && \
rm /tmp/kibana.tar.gz && \
useradd kibana && \
rm -rf /var/lib/apt/lists/* && \
chown -R kibana:kibana /opt/kibana/optimize/
chown -R kibana:kibana /opt/kibana/optimize/ && \
sed -i -E "s/^(#\s?+)?server.host: .+/server.host: 0.0.0.0/" /opt/kibana/config/kibana.yml
ADD start /start
ADD kibana.conf /etc/supervisor/conf.d/kibana.conf
ADD supervisor.conf /etc/supervisor/conf.d/supervisor.conf
ENTRYPOINT ["/start"]
EXPOSE 5601

View File

@ -1,5 +0,0 @@
[program:kibana]
command=/opt/kibana/bin/kibana --max-old-space-size=200
user=kibana
redirect_stderr=true
directory=/opt/kibana

12
start
View File

@ -4,13 +4,13 @@
trap 'kill $(jobs -p)' EXIT
if [ "$ELASTICSEARCH_HOSTNAME" != "" ]; then
sed -i -r "s/^(#\s*)?elasticsearch.url: .+/elasticsearch.url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
fi
if [ "$KIBANA_PORT" != "" ]; then
sed -i -r "s/^(#\s*)?server.port: .+/server.port: $KIBANA_PORT/" /opt/kibana/config/kibana.yml
sed -i -r "s/^(#\s?+)?elasticsearch.url: .+/elasticsearch.url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
fi
sed -i -r 's/^(#\s*)?server.host: .+/server.host: "0.0.0.0"/' /opt/kibana/config/kibana.yml
supervisord
if [ "$KIBANA_PORT" != "" ]; then
sed -i -E "s/^(#\s?+)?server.port: .+/server.port: $KIBANA_PORT/" /opt/kibana/config/kibana.yml
fi
su -c /opt/kibana/bin/kibana kibana

View File

@ -1,2 +0,0 @@
[supervisord]
nodaemon=true