From 4cdef479813fdd1514c68d559c483c628aff3de6 Mon Sep 17 00:00:00 2001 From: toddn Date: Wed, 14 Aug 2024 13:16:31 -0500 Subject: [PATCH 1/4] deploy added to dev yml file, values need to be updated --- docker-compose.dev.yml | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 61dcc8bf0..91f2ab740 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -22,6 +22,14 @@ services: image: mongo:5.0 ports: - "27017:27017" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -59,6 +67,15 @@ services: ports: - "9000:9000" - "9001:9001" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G + depends_on: - minio1 - minio2 @@ -71,6 +88,14 @@ services: - clowder2 volumes: - postgres_data:/var/lib/postgresql/data + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G environment: POSTGRES_DB: keycloak_dev POSTGRES_USER: keycloak @@ -97,6 +122,14 @@ services: KC_DB_PASSWORD: password ports: - 8080:8080 + deploy: + resources: + limits: + cpus: '0.50' + memory: 450M + reservations: + cpus: '0.25' + memory: 16G depends_on: - postgres @@ -105,6 +138,14 @@ services: ports: - "1080:80" - "25:25" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G # message broker rabbitmq: @@ -116,6 +157,14 @@ services: ports: - "5672:5672" - "15672:15672" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -128,6 +177,14 @@ services: ports: - 9200:9200 - 9300:9300 + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G environment: - cluster.name=clowder2 - discovery.type=single-node @@ -152,6 +209,14 @@ services: - RABBITMQ_HOST=rabbitmq - RABBITMQ_USER=${RABBITMQ_USER:-guest} - RABBITMQ_PASS=${RABBITMQ_PASS:-guest} + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 depends_on: @@ -168,6 +233,14 @@ services: - RABBITMQ_HOST=rabbitmq - RABBITMQ_USER=${RABBITMQ_USER:-guest} - RABBITMQ_PASS=${RABBITMQ_PASS:-guest} + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 depends_on: From 8a079477b17bbe655da1172c25be3936bc790d71 Mon Sep 17 00:00:00 2001 From: toddn Date: Wed, 14 Aug 2024 13:22:55 -0500 Subject: [PATCH 2/4] adding to docker compose --- docker-compose.yml | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f74ad11b6..e9aba9bf7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,14 @@ services: - "80:80" # The Web UI (enabled by --api.insecure=true) - "8080:8080" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -41,6 +49,14 @@ services: restart: unless-stopped build: context: ./backend + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 environment: @@ -81,6 +97,14 @@ services: restart: unless-stopped build: context: ./frontend + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 depends_on: @@ -99,6 +123,14 @@ services: build: context: backend dockerfile: heartbeat.Dockerfile + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 restart: unless-stopped @@ -116,6 +148,14 @@ services: build: context: backend dockerfile: messages.Dockerfile + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G environment: MONGODB_URL: mongodb://mongo:27017 RABBITMQ_HOST: ${RABBITMQ_HOST:-rabbitmq} @@ -131,6 +171,14 @@ services: mongo: image: mongo:5.0 restart: unless-stopped + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -168,6 +216,14 @@ services: image: nginx:1.19.2-alpine restart: unless-stopped hostname: nginx + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -181,6 +237,14 @@ services: postgres: image: postgres restart: unless-stopped + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -193,6 +257,14 @@ services: keycloak: image: quay.io/keycloak/keycloak:20.0 restart: unless-stopped + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 volumes: @@ -232,6 +304,14 @@ services: ports: - "5672:5672" - "15672:15672" + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G healthcheck: test: [ "CMD", "nc", "-z", "localhost", "5672" ] interval: 3s @@ -245,6 +325,14 @@ services: elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3 restart: unless-stopped + deploy: + resources: + limits: + cpus: '0.50' + memory: 50M + reservations: + cpus: '0.25' + memory: 16G networks: - clowder2 environment: From f785a29541c030d1a68dd0b856ef16242f4e5086 Mon Sep 17 00:00:00 2001 From: toddn Date: Mon, 19 Aug 2024 13:51:02 -0500 Subject: [PATCH 3/4] changing deploy resource limits --- docker-compose.dev.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 91f2ab740..37325bbee 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,10 +26,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -71,10 +71,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M depends_on: - minio1 @@ -92,10 +92,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M environment: POSTGRES_DB: keycloak_dev POSTGRES_USER: keycloak @@ -126,10 +126,10 @@ services: resources: limits: cpus: '0.50' - memory: 450M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M depends_on: - postgres @@ -142,10 +142,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M # message broker rabbitmq: @@ -161,10 +161,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -181,10 +181,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M environment: - cluster.name=clowder2 - discovery.type=single-node @@ -213,10 +213,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 depends_on: @@ -237,10 +237,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 17G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 depends_on: From 08983e35b23a72097b8bf9f604e4dcbeecf3317a Mon Sep 17 00:00:00 2001 From: toddn Date: Mon, 19 Aug 2024 13:53:02 -0500 Subject: [PATCH 4/4] changing deploy resource limits in docker compose file --- docker-compose.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e9aba9bf7..045a6c46b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,10 +34,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -53,10 +53,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 environment: @@ -101,10 +101,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 depends_on: @@ -127,10 +127,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 restart: unless-stopped @@ -152,10 +152,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M environment: MONGODB_URL: mongodb://mongo:27017 RABBITMQ_HOST: ${RABBITMQ_HOST:-rabbitmq} @@ -175,10 +175,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -220,10 +220,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -241,10 +241,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -261,10 +261,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 volumes: @@ -308,10 +308,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M healthcheck: test: [ "CMD", "nc", "-z", "localhost", "5672" ] interval: 3s @@ -329,10 +329,10 @@ services: resources: limits: cpus: '0.50' - memory: 50M + memory: 16G reservations: cpus: '0.25' - memory: 16G + memory: 50M networks: - clowder2 environment: