refactor(service): improve leantime

- rename some stuff
- formatting
This commit is contained in:
peaklabs-dev
2025-05-14 20:44:20 +02:00
parent 2960801f08
commit aa8d85efdf

View File

@@ -10,19 +10,21 @@ services:
environment: environment:
- SERVICE_FQDN_LEANTIME_8080 - SERVICE_FQDN_LEANTIME_8080
- LEAN_APP_URL=${SERVICE_FQDN_LEANTIME} - LEAN_APP_URL=${SERVICE_FQDN_LEANTIME}
- LEAN_DB_HOST=${DB_HOST:-leantimedb} - LEAN_DB_HOST=mysql
- LEAN_DB_USER=${SERVICE_USER_MYSQLDB} - LEAN_DB_USER=${SERVICE_USER_MYSQLDB}
- LEAN_DB_PASSWORD=${SERVICE_PASSWORD_MYSQLDB} - LEAN_DB_PASSWORD=${SERVICE_PASSWORD_MYSQLDB}
- LEAN_DB_DATABASE=${DB_NAME:-leantime} - LEAN_DB_DATABASE=${DB_NAME:-leantime-db}
- LEAN_SESSION_PASSWORD=${SERVICE_PASSWORD_64_SALT} - LEAN_SESSION_PASSWORD=${SERVICE_PASSWORD_64_SALT}
- LEAN_SESSION_EXPIRATION=${SESSION_EXPIRATION:-28800} - LEAN_SESSION_EXPIRATION=${SESSION_EXPIRATION:-28800}
- LEAN_USE_REDIS=${USE_REDIS:-true} - LEAN_USE_REDIS=${USE_REDIS:-true}
- LEAN_REDIS_HOST=${REDIS_HOST:-leantimeredis} - LEAN_REDIS_HOST=redis
- LEAN_REDIS_PORT=${REDIS_PORT:-6379} - LEAN_REDIS_PORT=${REDIS_PORT:-6379}
- LEAN_REDIS_SCHEME=${REDIS_SCHEME:-tcp} - LEAN_REDIS_SCHEME=${REDIS_SCHEME:-tcp}
depends_on: depends_on:
- leantimedb mysql:
- leantimeredis condition: service_healthy
redis:
condition: service_started
volumes: volumes:
- public-userfiles:/var/www/html/public/userfiles - public-userfiles:/var/www/html/public/userfiles
- userfiles:/var/www/html/userfiles - userfiles:/var/www/html/userfiles
@@ -33,16 +35,15 @@ services:
timeout: 20s timeout: 20s
retries: 10 retries: 10
leantimedb: mysql:
image: mysql:8.4 image: mysql:8.4
volumes: volumes:
- db_data:/var/lib/mysql - leantime_mysql_data:/var/lib/mysql
restart: unless-stopped
environment: environment:
- MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT} - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
- MYSQL_USER=${SERVICE_USER_MYSQLDB} - MYSQL_USER=${SERVICE_USER_MYSQLDB}
- MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQLDB} - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQLDB}
- MYSQL_DATABASE=${DB_NAME:-leantime} - MYSQL_DATABASE=${DB_NAME:-leantime-db}
command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
@@ -50,13 +51,13 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
leantimeredis: redis:
image: redis:7-alpine image: redis:7-alpine
command: redis-server --appendonly yes command: redis-server --appendonly yes
volumes: volumes:
- leantimeredis-data:/data - leantime_redis_data:/data
healthcheck: healthcheck:
test: [ "CMD", "redis-cli", "ping" ] test: ["CMD", "redis-cli", "ping"]
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 3 retries: 3