From ebea1789a662651b0a7714d14d74af7be79c9a18 Mon Sep 17 00:00:00 2001 From: Micha Date: Mon, 4 May 2026 13:40:23 +0200 Subject: [PATCH] Update docker-compose.yml --- ops/komodo/docker-compose.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/ops/komodo/docker-compose.yml b/ops/komodo/docker-compose.yml index cbd5d2d..611643c 100644 --- a/ops/komodo/docker-compose.yml +++ b/ops/komodo/docker-compose.yml @@ -47,24 +47,17 @@ services: - komodo_net - frontend_net extra_hosts: - - "git.kaleschke.info:172.30.0.17" + - "git.kaleschke.info:192.168.178.58" environment: - TZ=Europe/Berlin - KOMODO_HOST=https://komodo.kaleschke.info - KOMODO_TITLE=Kallilabcore - KOMODO_SECRET_KEY=${KOMODO_SECRET_KEY} - KOMODO_WEBHOOK_SECRET=${KOMODO_SECRET_KEY} -<<<<<<< HEAD - KOMODO_PASSKEY=${KOMODO_PERIPHERY_PASSKEY} - KOMODO_DATABASE_ADDRESS=komodo-mongo:27017 - KOMODO_DATABASE_USERNAME=komodo - KOMODO_DATABASE_PASSWORD=${KOMODO_MONGO_PASSWORD} -======= - - KOMODO_DATABASE_ADDRESS=komodo-mongo:27017 - - KOMODO_DATABASE_USERNAME=komodo - - KOMODO_DATABASE_PASSWORD=${KOMODO_MONGO_PASSWORD} - - KOMODO_PERIPHERY_PUBLIC_KEY=file:/config/keys/periphery.pub ->>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08 - KOMODO_LOG_LEVEL=info - KOMODO_LOCAL_AUTH=true - KOMODO_JWT_SECRET=${KOMODO_JWT_SECRET} @@ -93,22 +86,14 @@ services: volumes: - komodo_keys:/config/keys - /var/run/docker.sock:/var/run/docker.sock -<<<<<<< HEAD - /proc:/proc -======= - - /proc:/proc:ro ->>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08 - /mnt/user/appdata/komodo/periphery:/etc/komodo networks: - komodo_net environment: - PERIPHERY_ROOT_DIRECTORY=/mnt/user/services -<<<<<<< HEAD - PERIPHERY_PASSKEYS=${KOMODO_PERIPHERY_PASSKEY} - PERIPHERY_SSL_ENABLED=false -======= - - PERIPHERY_CORE_PUBLIC_KEYS=file:/config/keys/core.pub ->>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08 - TZ=Europe/Berlin extra_hosts: - "git.kaleschke.info:192.168.178.58"