1
0
Fork 0

linkace: fix non-working container

This commit is contained in:
Lukáš Kucharczyk 2023-09-15 15:13:56 +02:00
parent c3ad1026ee
commit 6b35dc0207
2 changed files with 11 additions and 9 deletions

4
.env
View File

@ -19,7 +19,7 @@ POSTGRES_HOST=postgres
POSTGRES_USER=lukas POSTGRES_USER=lukas
POSTGRES_PASSWORD=kralovna POSTGRES_PASSWORD=kralovna
POSTGRES_PORT=5432 POSTGRES_PORT=5432
MYSQL_SERVER=mariadb MYSQL_HOST=mariadb
MYSQL_USER=lukas MYSQL_USER=lukas
MYSQL_PASSWORD=kralovna MYSQL_PASSWORD=kralovna
MYSQL_ROOT_PASSWORD=kralovna MYSQL_ROOT_PASSWORD=kralovna
@ -100,4 +100,4 @@ LINKACE_EXTERNAL_PORT=8084
LINKACE_INTERNAL_PORT=80 LINKACE_INTERNAL_PORT=80
LINKACE_DB=linkace LINKACE_DB=linkace
LINKACE_DB_USERNAME=linkace LINKACE_DB_USERNAME=linkace
LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4 LINKACE_DB_PASSWORD=zghhRS&FdK6niiJg5Q5Nr3E4

View File

@ -734,21 +734,23 @@ services:
- public - public
- mariadb - mariadb
- redis - redis
depends_on:
- mariadb
- redis
environment: environment:
- DB_CONNECTION=mysql # these env variables are instead of .env file
- DB_HOST=${MYSQL_SERVER} # see https://www.linkace.org/docs/v1/setup/setup-with-docker/advanced-configuration/#using-docker-environment-variables-instead-of-the-env-file
- DB_PORT=${MYSQL_PORT} - APP_KEY=base64:X6XDR+dfqn5PM9QdmmxJoOECSsldWhkfnyi6yvohgNM=
- DB_HOST=${MYSQL_HOST}
- DB_DATABASE=${LINKACE_DB} - DB_DATABASE=${LINKACE_DB}
- DB_USERNAME=${LINKACE_DB_USERNAME} - DB_USERNAME=${LINKACE_DB_USERNAME}
- DB_PASSWORD=${LINKACE_DB_PASSWORD} - DB_PASSWORD=${LINKACE_DB_PASSWORD}
- REDIS_HOST=redis - REDIS_HOST=redis
depends_on:
- mariadb
- redis
ports: ports:
- "${LINKACE_EXTERNAL_PORT}:${LINKACE_INTERNAL_PORT}" - "${LINKACE_EXTERNAL_PORT}:${LINKACE_INTERNAL_PORT}"
volumes: volumes:
- ${DOCKER_STORAGE_PATH}/linkace/backups:/app/storage/app/backups - ${DOCKER_STORAGE_PATH}/linkace/backups:/app/storage/app/backups
- ${DOCKER_STORAGE_PATH}/linkace/logs:/app/storage/logs
restart: unless-stopped restart: unless-stopped
profiles: profiles:
- base - base
@ -773,4 +775,4 @@ networks:
attachable: true attachable: true
volumes: volumes:
timetracker-static: timetracker-static: