From 6f9045212875208582f6bac2c39ae6aa3d3b6125 Mon Sep 17 00:00:00 2001
From: dave <dave_gitlab@davepedu.com>
Date: Sat, 18 Aug 2018 18:48:52 -0700
Subject: [PATCH] modernize

---
 Dockerfile      | 16 ++++++++--------
 kibana.conf     |  5 -----
 start           | 12 ++++++------
 supervisor.conf |  2 --
 4 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 kibana.conf
 delete mode 100644 supervisor.conf

diff --git a/Dockerfile b/Dockerfile
index a5589af..56618b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/kibana.conf b/kibana.conf
deleted file mode 100644
index 31e1225..0000000
--- a/kibana.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[program:kibana]
-command=/opt/kibana/bin/kibana --max-old-space-size=200
-user=kibana
-redirect_stderr=true
-directory=/opt/kibana
\ No newline at end of file
diff --git a/start b/start
index a1cb945..20fa420 100755
--- a/start
+++ b/start
@@ -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
diff --git a/supervisor.conf b/supervisor.conf
deleted file mode 100644
index 54296b8..0000000
--- a/supervisor.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[supervisord]
-nodaemon=true