From 9660663c6c6eddbacc8a52e0b5c7212afe6e5da7 Mon Sep 17 00:00:00 2001
From: Robin Schulz <hello@rschu.me>
Date: Sat, 30 Mar 2024 18:52:07 +0100
Subject: [PATCH] - env vars removed from `environment` block in docker compose
 yaml as they are coming from the dot env file anyway - Kibana Dockerfile
 updated accordingly

---
 docker-compose.yml       | 15 ---------------
 docker/kibana/Dockerfile |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 143d4bc..8aff58f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,13 +7,6 @@ services:
       dockerfile: docker/audit-logger/Dockerfile
     env_file:
       - .env
-    environment:
-      - CONFIG_FILE_PATH=${CONFIG_FILE_PATH}
-      - ELASTIC_USERNAME=${ELASTIC_USERNAME}
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - ELASTIC_URL=${ELASTIC_URL}
-      - ELASTIC_INDEX_NAME=${ELASTIC_INDEX_NAME}
-      - ELASTIC_HOSTS=${ELASTIC_HOSTS}
     restart: unless-stopped
     volumes:
       - ./:/app
@@ -32,12 +25,6 @@ services:
       - .env
     environment:
       - discovery.type=single-node
-      - PIPELINE_WORKERS=4
-      - LOG_LEVEL=debug
-      - MONITORING_ENABLED=enabled
-      - xpack.security.enabled=true
-      - ELASTIC_USERNAME=${ELASTIC_USERNAME}
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
     ulimits:
       memlock:
         soft: -1
@@ -63,8 +50,6 @@ services:
       - .env
     environment:
       - elasticsearch.hosts=elasticsearch:9200
-      - ELASTICSEARCH_USERNAME=${ELASTIC_USERNAME}
-      - ELASTICSEARCH_PASSWORD=${ELASTIC_USERNAME}
     restart: unless-stopped
     volumes:
       - sa_kibana_data:/usr/share/kibana/data
diff --git a/docker/kibana/Dockerfile b/docker/kibana/Dockerfile
index b84dc2f..93efcb5 100644
--- a/docker/kibana/Dockerfile
+++ b/docker/kibana/Dockerfile
@@ -3,6 +3,10 @@ FROM arm64v8/kibana:${KIBANA_VERSION}
 
 USER root
 
+ENV \
+    ELASTICSEARCH_USERNAME=${ELASTIC_USERNAME} \
+    ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
+
 RUN mkdir -p /opt/shell-scripts
 
 COPY ./*.sh /opt/shell-scripts