nerdlicht/docker-container
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	plantit/docker-compose.yaml
#	plantit/server.env
This commit is contained in:
Sönke Domröse
2025-05-07 15:20:22 +02:00
parent 0c7840bd5c 34567180b3
commit 9d0be102eb
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plantit/docker-compose.yaml
View File

@@ -5,11 +5,9 @@ services:
env_file: server.env env_file: server.env
depends_on: depends_on:
- db - db
- cache
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- "/home/soenke/docker-data/plantit/upload-dir:/upload-dir" - "/home/soenke/docker-data/plantit/upload-dir:/upload-dir"
- "/home/soenke/docker-data/plantit/certs:/certificates"
ports: ports:
- "8632:8080" - "8632:8080"
- "3632:3000" - "3632:3000"
@@ -18,9 +16,13 @@ services:
image: mysql:8.0 image: mysql:8.0
restart: always restart: always
env_file: server.env env_file: server.env
ports:
- "3306:3306"
volumes: volumes:
- "./db:/var/lib/mysql" - "/home/soenke/docker-data/plantit/db:/var/lib/mysql"
environment:
cache: MYSQL_ROOT_PASSWORD: root
image: redis:7.2.1 MYSQL_DATABASE: bootdb
restart: always MYSQL_USER: root
MYSQL_PASSWORD: root
MYSQL_HOST: db

22
plantit/server.env
View File

@@ -11,7 +11,7 @@ MYSQL_ROOT_PASSWORD=root
# #
# JWT # JWT
# #
JWT_SECRET=8ec571c0625722935e3940c35e56af08209eb6591b26e4cd73bd4d0dbb261904457941ba52c857edca7374b86749b389b9d37a081345b6dae13dd10d0f0b151b4919c076051845206b57b23ec62769951a0a5286d630fa0b6234cd6799dff44b70b961308796aefbe701de026fee1a718a4604e4722c6d27725c9b9466e428ac19a8ba052781589cf7142a045900839e12d1de5a0308c22188810a5ea97c2bbb3ff87f1178dc377fb997cefb4aaf68689d4c6bec2f5f67c881f66dfb16540ff5a8259d90cba9d2a53df46c4a9ad57c1cc7cc9cc13f357f679b7b8263dc3282eca13fba70e014a0677abf1eaf972886f87f97ee7e31ef8b002971a38c6e4ce7d1 JWT_SECRET=6a837ed16d20acb8b0af7c7d5c16725d58da86e89649eb857293e2995f0ae09a8c85694476fe32e46d25c612af9ade6e2374a4b93ff0348d1529a8ce583b3520fb380ab69e12f80097332835cd30c605612b475c6d675d47c1616289790cb2a8b268dd8a08150b8a7681a72689e650877c010ff700906df1b539ca4f651a1276a62e2d2c199819a8f7ded0291b58b6668fd280d1ab5258329362f64a37786cd1801e0286cd812234c48d85beb84ce51f70d0f4c23ebd49646377c1cc9b29b050080209699fc517f7deaa960279d86b8c2ca28cfe2d5a31a24713145ca5434c940e75455bc1b99d4fbe9569b3d80887b45d4ebb4107879567fce3f2c5ca959189
JWT_EXP=1 JWT_EXP=1
# #
@@ -19,24 +19,16 @@ JWT_EXP=1
# #
USERS_LIMIT=-1 USERS_LIMIT=-1
UPLOAD_DIR=/upload-dir UPLOAD_DIR=/upload-dir
API_PORT=8632 API_PORT=8080
TREFLE_KEY= FLORACODEX_KEY=
LOG_LEVEL=DEBUG LOG_LEVEL=DEBUG
ALLOWED_ORIGINS=* ALLOWED_ORIGINS=*
# #
# Cache # Cache
# #
CACHE_TTL=86400 CACHE_TYPE=none
CACHE_HOST=cache
CACHE_PORT=6379
# FLORACODEX_KEY=CzugP80KW7ujgxexVwD9ejA7RIrZT6AoORctImt0XgUS-5MdC1lmY02vbg7c5DJ4
# SMTP ALLOWED_ORIGINS=*
# SSL_ENABLED=false
SMTP_HOST=
SMTP_PORT=
SMTP_EMAIL=
SMTP_PASSWORD=
SMTP_AUTH=
SMTP_START_TTL=