testing modification

This commit is contained in:
Daniere Mathieu 2023-10-30 09:45:36 +01:00
parent dd47300d37
commit 78d96cab44
3 changed files with 23 additions and 14 deletions

View File

@ -16,8 +16,21 @@
{ {
"type": "boolean", "type": "boolean",
"label": "https enable", "label": "https enable",
"required": true, "env_variable": "KOILLECTION_HTTPS_ENABLED"
"env_variable": "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"
} }
] ]
} }

View File

@ -10,26 +10,25 @@ services:
depends_on: depends_on:
- db - db
volumes: volumes:
- ${APP_DATA_DIR}/data/volumes/koillection/uploads:/uploads - ${APP_DATA_DIR}/data/uploads:/uploads
environment: environment:
- APP_DEBUG=0 - APP_DEBUG=0
- APP_ENV=prod - APP_ENV=prod
- HTTPS_ENABLED={HTTPS_ENABLED} - HTTPS_ENABLED={KOILLECTION_HTTPS_ENABLED}
- UPLOAD_MAX_FILESIZE=20M - UPLOAD_MAX_FILESIZE=20M
- PHP_MEMORY_LIMIT=512M - PHP_MEMORY_LIMIT=512M
- PHP_TZ=${TZ} - 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_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
- JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem - JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
- DB_DRIVER=pdo_pgsql - DB_DRIVER=pdo_pgsql
- DB_NAME=koillection - DB_NAME=koillection
- DB_HOST=db - DB_HOST=db
- DB_PORT=5432 - DB_PORT=5432
- DB_USER=root - DB_USER={KOILLECTION_DB_USER}
- DB_PASSWORD=root - DB_PASSWORD={KOILLECTION_DB_PASSWORD}
- DB_VERSION=15 - DB_VERSION=15
networks: networks:
- koillection
- tipi_main_network - tipi_main_network
labels: labels:
# Main # Main
@ -57,9 +56,9 @@ services:
traefik.http.routers.koillection-local.service: koillection traefik.http.routers.koillection-local.service: koillection
traefik.http.routers.koillection-local.tls: true traefik.http.routers.koillection-local.tls: true
db: koillection-db:
image: postgres:15 image: postgres:15
container_name: db container_name: koillection-db
restart: unless-stopped restart: unless-stopped
environment: environment:
- POSTGRES_DB=koillection - POSTGRES_DB=koillection
@ -69,7 +68,4 @@ services:
volumes: volumes:
- ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data - ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data
networks: networks:
- koillection - tipi_main_network
networks:
koillection:
driver: bridge

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 62 KiB