modernize
This commit is contained in:
parent
6ab3b20bf0
commit
6f90452128
16
Dockerfile
16
Dockerfile
|
@ -1,18 +1,18 @@
|
||||||
FROM ubuntu:trusty
|
FROM ubuntu:bionic
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y curl supervisor && \
|
apt-get install -y wget && \
|
||||||
mkdir /opt/kibana && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
curl -o /tmp/kibana.tar.gz https://artifacts.elastic.co/downloads/kibana/kibana-5.3.1-linux-x86_64.tar.gz && \
|
|
||||||
|
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 && \
|
tar -C /opt/kibana/ -zxvf /tmp/kibana.tar.gz --strip-components=1 && \
|
||||||
rm /tmp/kibana.tar.gz && \
|
rm /tmp/kibana.tar.gz && \
|
||||||
useradd kibana && \
|
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 start /start
|
||||||
ADD kibana.conf /etc/supervisor/conf.d/kibana.conf
|
|
||||||
ADD supervisor.conf /etc/supervisor/conf.d/supervisor.conf
|
|
||||||
|
|
||||||
ENTRYPOINT ["/start"]
|
ENTRYPOINT ["/start"]
|
||||||
EXPOSE 5601
|
EXPOSE 5601
|
||||||
|
|
|
@ -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
12
start
|
@ -4,13 +4,13 @@
|
||||||
trap 'kill $(jobs -p)' EXIT
|
trap 'kill $(jobs -p)' EXIT
|
||||||
|
|
||||||
if [ "$ELASTICSEARCH_HOSTNAME" != "" ]; then
|
if [ "$ELASTICSEARCH_HOSTNAME" != "" ]; then
|
||||||
sed -i -r "s/^(#\s*)?elasticsearch.url: .+/elasticsearch.url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
|
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed -i -r 's/^(#\s*)?server.host: .+/server.host: "0.0.0.0"/' /opt/kibana/config/kibana.yml
|
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
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
[supervisord]
|
|
||||||
nodaemon=true
|
|
Loading…
Reference in New Issue