From f7007ccfca32b678ec3c76f64a1356d4e9a549e6 Mon Sep 17 00:00:00 2001 From: Andrea Vouk Date: Sun, 19 Apr 2026 13:21:10 +0200 Subject: [PATCH 1/2] fix: rabbitmq container startup --- .github/workflows/merge-gate.yml | 10 +++++++++- docker-compose.yml | 15 ++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/merge-gate.yml b/.github/workflows/merge-gate.yml index eebb5a1..ec9b6ae 100644 --- a/.github/workflows/merge-gate.yml +++ b/.github/workflows/merge-gate.yml @@ -38,7 +38,15 @@ jobs: --health-retries 20 rabbitmq: - image: rabbitmq:3-management-alpine + image: rabbitmq:4-management-alpine + entrypoint: + - /bin/sh + - -c + - |- + echo ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx > /var/lib/rabbitmq/.erlang.cookie + chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie + chmod 0400 /var/lib/rabbitmq/.erlang.cookie + exec docker-entrypoint.sh rabbitmq-server ports: - 5672:5672 - 15672:15672 diff --git a/docker-compose.yml b/docker-compose.yml index 866b1c2..7bb4759 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,15 +20,22 @@ services: - RI_REDIS_PORT=6379 ports: - 5540:5540 - + rabbitmq: image: rabbitmq:4.2-management + entrypoint: + - /bin/sh + - -c + - |- + echo ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx > /var/lib/rabbitmq/.erlang.cookie + chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie + chmod 0400 /var/lib/rabbitmq/.erlang.cookie + exec docker-entrypoint.sh rabbitmq-server ports: - 5672:5672 - 15672:15672 volumes: - - rabbitmq-lib:/var/lib/rabbitmq/ - - rabbitmq-log:/var/log/rabbitmq/ + - rabbitmq-lib:/var/lib/rabbitmq/mnesia healthcheck: test: rabbitmq-diagnostics check_port_connectivity interval: 1s @@ -64,8 +71,6 @@ services: retries: 20 volumes: - rabbitmq-log: - driver: local rabbitmq-lib: driver: local postgres_data: From 336cd74643e3cfe47cb93b4d4faa56d883ea6401 Mon Sep 17 00:00:00 2001 From: Andrea Vouk Date: Sun, 19 Apr 2026 13:53:27 +0200 Subject: [PATCH 2/2] fix: rabbitmq container startup --- .github/workflows/merge-gate.yml | 11 +++-------- docker-compose.yml | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/merge-gate.yml b/.github/workflows/merge-gate.yml index ec9b6ae..31637ab 100644 --- a/.github/workflows/merge-gate.yml +++ b/.github/workflows/merge-gate.yml @@ -39,14 +39,9 @@ jobs: rabbitmq: image: rabbitmq:4-management-alpine - entrypoint: - - /bin/sh - - -c - - |- - echo ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx > /var/lib/rabbitmq/.erlang.cookie - chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie - chmod 0400 /var/lib/rabbitmq/.erlang.cookie - exec docker-entrypoint.sh rabbitmq-server + env: + RABBITMQ_ERLANG_COOKIE: ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx + ERL_FLAGS: "-setcookie ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx" ports: - 5672:5672 - 15672:15672 diff --git a/docker-compose.yml b/docker-compose.yml index 7bb4759..7a48a79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,14 +23,9 @@ services: rabbitmq: image: rabbitmq:4.2-management - entrypoint: - - /bin/sh - - -c - - |- - echo ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx > /var/lib/rabbitmq/.erlang.cookie - chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie - chmod 0400 /var/lib/rabbitmq/.erlang.cookie - exec docker-entrypoint.sh rabbitmq-server + environment: + RABBITMQ_ERLANG_COOKIE: ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx + ERL_FLAGS: "-setcookie ETRUG5XhX7VpYEEC2W2ps5ebnLvC4SMx" ports: - 5672:5672 - 15672:15672