From e91a29c151a55a599827163a0a681a4c4827f410 Mon Sep 17 00:00:00 2001 From: shinobi Date: Fri, 7 Mar 2025 15:33:57 -0500 Subject: [PATCH] updating from disk --- compose.yaml | 68 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/compose.yaml b/compose.yaml index 43aca84..caff2ba 100644 --- a/compose.yaml +++ b/compose.yaml @@ -78,7 +78,7 @@ services: volumes: - - /yankee/volumes/files/:/media + - /yankee/volumes/downloads/:/media ports: @@ -190,12 +190,12 @@ services: ## ########################################## - osiris-messaging: - - container_name: osiris-messaging + yankee-fire-control-activemq: + + container_name: yankee-fire-control-activemq + + image: webcenter/activemq:5.14.3 - image: webcenter/activemq:latest - ports: - "1883:1883" @@ -210,20 +210,16 @@ services: - "61616:61616" - volumes: + networks: [backing-services] - - /yankee/volumes/activemq/data:/data/activemq - - - /yankee/volumes/activemq/logs:/var/log/activemq + volumes: ["activemq-data:/opt/activemq/conf", "activemq-data:/data/activemq", "activemq-data:/var/log/activemq"] expose: - 8161 - - environment: - + ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT: "true" ACTIVEMQ_ADMIN_LOGIN: admin @@ -238,12 +234,46 @@ services: ACTIVEMQ_READ_PASSWORD: password + ACTIVEMQ_JMX_LOGIN: jmx + + ACTIVEMQ_JMX_PASSWORD: password + + ACTIVEMQ_STATIC_TOPICS: static-topic-1;static-topic-2 + + ACTIVEMQ_STATIC_QUEUES: static-queue-1;static-queue-2 + + ACTIVEMQ_ENABLED_SCHEDULER: "true" + + ACTIVEMQ_MIN_MEMORY: 512 + + ACTIVEMQ_MAX_MEMORY: 2048 + VIRTUAL_PORT: 8161 VIRTUAL_HOST: messaging.yankee.embanet.online LETSENCRYPT_HOST: messaging.yankee.embanet.online + yankee-fire-control-postgres: + + container_name: yankee-fire-control-postgres + + image: healthcheck/postgres:alpine + + ports: ["5432:5432"] + + networks: [backing-services] + + volumes: ["postgres-data:/var/lib/postgresql/data"] + + environment: + + POSTGRES_DB: db + + POSTGRES_USER: user + + POSTGRES_PASSWORD: password + ########################################## ## ## osiris / restful api @@ -303,3 +333,15 @@ services: VIRTUAL_HOST: yankee.embanet.online LETSENCRYPT_HOST: yankee.embanet.online + +volumes: + + activemq-data: {} + + postgres-data: {} + +networks: + + backing-services: + + driver: bridge