From 2650556d69a8ce733b98f106b733b883d41102c0 Mon Sep 17 00:00:00 2001
From: Peter Reichart <pr@hochvogel.de>
Date: Mon, 27 Mar 2023 15:21:52 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=9Eglpi/docker-compose.yml=E2=80=9C=20?=
 =?UTF-8?q?=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 glpi/docker-compose.yml | 49 +++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/glpi/docker-compose.yml b/glpi/docker-compose.yml
index dc90f4d5..fbd7fbcb 100644
--- a/glpi/docker-compose.yml
+++ b/glpi/docker-compose.yml
@@ -7,11 +7,11 @@ services:
         volumes: 
           - ./volumes/mariadb:/var/lib/mysql:rw
         environment: 
-          MYSQL_DATABASE: glpi
-          MYSQL_USER: glpi-user 
-          MYSQL_PASSWORD: glpi-pass 
-          MYSQL_RANDOM_ROOT_PASSWORD: 1
-          TZ: Europe/Berlin
+          MARIADB_DATABASE: ${MARIADB_DATABASE}
+          MARIADB_USER: ${MARIADB_USER}
+          MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+          MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
+          TZ: ${TZ}
 #        ports: 
 #          - 3306:3306
         networks: 
@@ -24,18 +24,18 @@ services:
           - ./volumes/glpi-files:/var/www/html/files:rw
           - ./volumes/glpi-plugins:/var/www/html/plugins:rw
         environment: 
-          GLPI_LANG: de_DE
-          MARIADB_HOST: mariadb-glpi
-          MARIADB_PORT: 3306
-          MARIADB_DATABASE: glpi
-          MARIADB_USER: glpi-user
-          MARIADB_PASSWORD: glpi-pass
+          GLPI_LANG: ${GLPI_LANG}
+          MARIADB_HOST: ${MARIADB_HOST}
+          MARIADB_PORT: ${MARIADB_PORT}
+          MARIADB_DATABASE: ${MARIADB_DATABASE}
+          MARIADB_USER: ${MARIADB_USER}
+          MARIADB_PASSWORD: ${MARIADB_PASSWORD}
           VERSION: "9.5.6"
           PLUGINS: "all"
-          TIMEZONE: Europe/Berlin
-          FQDN: it.ostrach.tld
-          ADMINEMAIL: user@hochvogel.de
-          ORGANIZATION: OstrachHELP
+          TIMEZONE: ${TZ}
+          FQDN: ${FQDN}
+          ADMINEMAIL: ${ADMINEMAIL}
+          ORGANIZATION: ${ORGANIZATION}
         depends_on: 
           - mariadb-glpi
         ports: 
@@ -57,24 +57,15 @@ services:
         depends_on:
           - mariadb-glpi
         environment: 
-          MARIADB_HOST: mariadb-glpi
-          MARIADB_PORT: 3306
-          MARIADB_DATABASE: glpi
-          MARIADB_USER: glpi-user
-          MARIADB_PASSWORD: glpi-pass
+          MARIADB_HOST: ${MARIADB_HOST}
+          MARIADB_PORT: ${MARIADB_PORT}
+          MARIADB_DATABASE: ${MARIADB_DATABASE}
+          MARIADB_USER: ${MARIADB_USER}
+          MARIADB_PASSWORD: ${MARIADB_PASSWORD}
         networks: 
           - glpi-backend
 #
-# VOLUMES
-#
-#volumes: 
-#  glpi-volume:
-#  glpi-volume-files:
-#  glpi-volume-plugins:
-#  mariadb-glpi-volume: 
-#
 # NETWORKS
-#
 networks: 
   glpi-frontend: 
   glpi-backend: