From 6b35dc0207a1da9ccd8d8c6b1a7ea59a06f8fea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 15 Sep 2023 15:13:56 +0200
Subject: [PATCH] linkace: fix non-working container

---
 .env               |  4 ++--
 docker-compose.yml | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index 05e628d..8f3d1ed 100644
--- a/.env
+++ b/.env
@@ -19,7 +19,7 @@ POSTGRES_HOST=postgres
 POSTGRES_USER=lukas
 POSTGRES_PASSWORD=kralovna
 POSTGRES_PORT=5432
-MYSQL_SERVER=mariadb
+MYSQL_HOST=mariadb
 MYSQL_USER=lukas
 MYSQL_PASSWORD=kralovna
 MYSQL_ROOT_PASSWORD=kralovna
@@ -100,4 +100,4 @@ LINKACE_EXTERNAL_PORT=8084
 LINKACE_INTERNAL_PORT=80
 LINKACE_DB=linkace
 LINKACE_DB_USERNAME=linkace
-LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4
\ No newline at end of file
+LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4
diff --git a/docker-compose.yml b/docker-compose.yml
index 86342b9..61196bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -734,21 +734,23 @@ services:
       - public
       - mariadb
       - redis
+    depends_on:
+      - mariadb
+      - redis
     environment:
-      - DB_CONNECTION=mysql
-      - DB_HOST=${MYSQL_SERVER}
-      - DB_PORT=${MYSQL_PORT}
+      # these env variables are instead of .env file
+      # see https://www.linkace.org/docs/v1/setup/setup-with-docker/advanced-configuration/#using-docker-environment-variables-instead-of-the-env-file
+      - APP_KEY=base64:X6XDR+dfqn5PM9QdmmxJoOECSsldWhkfnyi6yvohgNM=
+      - DB_HOST=${MYSQL_HOST}
       - DB_DATABASE=${LINKACE_DB}
       - DB_USERNAME=${LINKACE_DB_USERNAME}
       - DB_PASSWORD=${LINKACE_DB_PASSWORD}
       - REDIS_HOST=redis
-    depends_on:
-      - mariadb
-      - redis
     ports:
       - "${LINKACE_EXTERNAL_PORT}:${LINKACE_INTERNAL_PORT}"
     volumes:
       - ${DOCKER_STORAGE_PATH}/linkace/backups:/app/storage/app/backups
+      - ${DOCKER_STORAGE_PATH}/linkace/logs:/app/storage/logs
     restart: unless-stopped
     profiles:
       - base
@@ -773,4 +775,4 @@ networks:
     attachable: true
 
 volumes:
-  timetracker-static:
\ No newline at end of file
+  timetracker-static: