diff --git a/apps/koillection/config.json b/apps/koillection/config.json index db6e29cc..b2e5eceb 100644 --- a/apps/koillection/config.json +++ b/apps/koillection/config.json @@ -16,8 +16,21 @@ { "type": "boolean", "label": "https enable", - "required": true, - "env_variable": "HTTPS_ENABLED" + "env_variable": "KOILLECTION_HTTPS_ENABLED" + }, + { + "type": "random", + "label": "database user", + "min": 15, + "max": 15, + "env_variable": "KOILLECTION_DB_USER" + }, + { + "type": "random", + "label": "database password", + "min": 30, + "max": 30, + "env_variable": "KOILLECTION_DB_PASSWORD" } ] } \ No newline at end of file diff --git a/apps/koillection/docker-compose.yml b/apps/koillection/docker-compose.yml index a7e1fa21..c28adcc4 100644 --- a/apps/koillection/docker-compose.yml +++ b/apps/koillection/docker-compose.yml @@ -10,26 +10,25 @@ services: depends_on: - db volumes: - - ${APP_DATA_DIR}/data/volumes/koillection/uploads:/uploads + - ${APP_DATA_DIR}/data/uploads:/uploads environment: - APP_DEBUG=0 - APP_ENV=prod - - HTTPS_ENABLED={HTTPS_ENABLED} + - HTTPS_ENABLED={KOILLECTION_HTTPS_ENABLED} - UPLOAD_MAX_FILESIZE=20M - PHP_MEMORY_LIMIT=512M - PHP_TZ=${TZ} - - CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' + - CORS_ALLOW_ORIGIN=* - JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem - JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem - DB_DRIVER=pdo_pgsql - DB_NAME=koillection - DB_HOST=db - DB_PORT=5432 - - DB_USER=root - - DB_PASSWORD=root + - DB_USER={KOILLECTION_DB_USER} + - DB_PASSWORD={KOILLECTION_DB_PASSWORD} - DB_VERSION=15 networks: - - koillection - tipi_main_network labels: # Main @@ -57,9 +56,9 @@ services: traefik.http.routers.koillection-local.service: koillection traefik.http.routers.koillection-local.tls: true - db: + koillection-db: image: postgres:15 - container_name: db + container_name: koillection-db restart: unless-stopped environment: - POSTGRES_DB=koillection @@ -69,7 +68,4 @@ services: volumes: - ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data networks: - - koillection -networks: - koillection: - driver: bridge \ No newline at end of file + - tipi_main_network \ No newline at end of file diff --git a/apps/koillection/metadata/logo.jpg b/apps/koillection/metadata/logo.jpg index 3a0627ed..49a5a7d8 100644 Binary files a/apps/koillection/metadata/logo.jpg and b/apps/koillection/metadata/logo.jpg differ