From 332f1bdc869853146cc46537dfb0b31d89ae9c0f Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Thu, 10 Jul 2025 18:13:35 +0200 Subject: [PATCH 1/2] upgraded rabbitmq --- services/autoscaling/tests/manual/docker-compose.yml | 2 +- services/director-v2/docker-compose-extra.yml | 2 +- services/docker-compose.yml | 2 +- .../web/server/tests/unit/with_dbs/docker-compose-devel.yml | 2 +- services/web/server/tests/unit/with_dbs/docker-compose.yml | 2 +- tests/swarm-deploy/conftest.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/autoscaling/tests/manual/docker-compose.yml b/services/autoscaling/tests/manual/docker-compose.yml index a28712fb0af..5056ca52820 100644 --- a/services/autoscaling/tests/manual/docker-compose.yml +++ b/services/autoscaling/tests/manual/docker-compose.yml @@ -1,6 +1,6 @@ services: rabbit: - image: itisfoundation/rabbitmq:3.13.7-management + image: itisfoundation/rabbitmq:4.1.2-management init: true hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}" ports: diff --git a/services/director-v2/docker-compose-extra.yml b/services/director-v2/docker-compose-extra.yml index 5923b000384..1f5c306c1ec 100644 --- a/services/director-v2/docker-compose-extra.yml +++ b/services/director-v2/docker-compose-extra.yml @@ -24,7 +24,7 @@ services: "log_line_prefix=[%p] [%a] [%c] [%x] " ] rabbit: - image: itisfoundation/rabbitmq:3.13.7-management + image: itisfoundation/rabbitmq:4.1.2-management init: true environment: - RABBITMQ_DEFAULT_USER=${RABBIT_USER} diff --git a/services/docker-compose.yml b/services/docker-compose.yml index cb92ec8b43c..12df90edf98 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -1286,7 +1286,7 @@ services: networks: *storage_networks rabbit: - image: itisfoundation/rabbitmq:3.13.7-management + image: itisfoundation/rabbitmq:4.1.2-management init: true hostname: "{{.Node.Hostname}}-{{.Task.Slot}}" environment: diff --git a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml index 15c36b03136..16f5037efc2 100644 --- a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml +++ b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml @@ -88,7 +88,7 @@ services: - "18081:8081" rabbit: - image: itisfoundation/rabbitmq:3.13.7-management + image: itisfoundation/rabbitmq:4.1.2-management init: true environment: - RABBITMQ_DEFAULT_USER=admin diff --git a/services/web/server/tests/unit/with_dbs/docker-compose.yml b/services/web/server/tests/unit/with_dbs/docker-compose.yml index f2cba772f46..65a9eabb85a 100644 --- a/services/web/server/tests/unit/with_dbs/docker-compose.yml +++ b/services/web/server/tests/unit/with_dbs/docker-compose.yml @@ -53,5 +53,5 @@ services: "${TEST_REDIS_PASSWORD}" ] rabbit: - image: itisfoundation/rabbitmq:3.13.7-management + image: itisfoundation/rabbitmq:4.1.2-management init: true diff --git a/tests/swarm-deploy/conftest.py b/tests/swarm-deploy/conftest.py index debb3529a2d..9825fb782a4 100644 --- a/tests/swarm-deploy/conftest.py +++ b/tests/swarm-deploy/conftest.py @@ -111,7 +111,7 @@ def simcore_stack_deployed_services( # logs table like # ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR # xbrhmaygtb76 simcore_sidecar.1 itisfoundation/sidecar:latest crespo-wkstn Running Running 53 seconds ago - # zde7p8qdwk4j simcore_rabbit.1 itisfoundation/rabbitmq:3.13.7-management crespo-wkstn Running Running 59 seconds ago + # zde7p8qdwk4j simcore_rabbit.1 itisfoundation/rabbitmq:4.1.2-management crespo-wkstn Running Running 59 seconds ago # f2gxmhwq7hhk simcore_postgres.1 postgres:10.10 crespo-wkstn Running Running about a minute ago # 1lh2hulxmc4q simcore_director.1 itisfoundation/director:latest crespo-wkstn Running Running 34 seconds ago # ... From 3125c364e25988d38b79de337f1c995fad90d9d1 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Thu, 10 Jul 2025 18:21:47 +0200 Subject: [PATCH 2/2] upgraded adminer --- packages/postgres-database/tests/docker-compose.yml | 2 +- services/docker-compose-ops.yml | 2 +- .../web/server/tests/unit/with_dbs/docker-compose-devel.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/postgres-database/tests/docker-compose.yml b/packages/postgres-database/tests/docker-compose.yml index cfaa1c2b9ba..ec569e050d3 100644 --- a/packages/postgres-database/tests/docker-compose.yml +++ b/packages/postgres-database/tests/docker-compose.yml @@ -41,7 +41,7 @@ services: # - net.ipv4.tcp_keepalive_probes=9 # - net.ipv4.tcp_keepalive_time=600 adminer: - image: adminer:4.8.1 + image: adminer:5.3.0 init: true environment: - ADMINER_DEFAULT_SERVER=postgres diff --git a/services/docker-compose-ops.yml b/services/docker-compose-ops.yml index 3db7af6aed0..a7ce2c82c9c 100644 --- a/services/docker-compose-ops.yml +++ b/services/docker-compose-ops.yml @@ -20,7 +20,7 @@ services: adminer: - image: adminer:4.8.1 + image: adminer:5.3.0 init: true environment: ADMINER_DEFAULT_SERVER : postgres diff --git a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml index 16f5037efc2..ca87a8c7e56 100644 --- a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml +++ b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml @@ -38,7 +38,7 @@ services: - "-c" - "fsync=off" adminer: - image: adminer:4.8.1 + image: adminer:5.3.0 init: true environment: - ADMINER_DEFAULT_SERVER=postgres