From 115b9fa4b3d516b2faf3c339a5e69a3bf0d50acb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sun, 17 Mar 2024 21:14:44 +0100 Subject: [PATCH] Fix rabbitmq config --- .env.example | 2 +- back/Dockerfile | 1 + back/Dockerfile.dev | 1 + back/src/Kyoo.RabbitMq/RabbitMqModule.cs | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index d2c7391b..53e60d07 100644 --- a/.env.example +++ b/.env.example @@ -74,6 +74,6 @@ POSTGRES_PORT=5432 MEILI_HOST="http://meilisearch:7700" MEILI_MASTER_KEY="ghvjkgisbgkbgskegblfqbgjkebbhgwkjfb" -RABBITMQ_HOST=rabbitmq:5672 +RABBITMQ_HOST=rabbitmq RABBITMQ_DEFAULT_USER=kyoo RABBITMQ_DEFAULT_PASS=aohohunuhouhuhhoahothonseuhaoensuthoaentsuhha diff --git a/back/Dockerfile b/back/Dockerfile index 862dbbfe..aee9f87e 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -11,6 +11,7 @@ COPY src/Kyoo.Core/Kyoo.Core.csproj src/Kyoo.Core/Kyoo.Core.csproj COPY src/Kyoo.Host/Kyoo.Host.csproj src/Kyoo.Host/Kyoo.Host.csproj COPY src/Kyoo.Postgresql/Kyoo.Postgresql.csproj src/Kyoo.Postgresql/Kyoo.Postgresql.csproj COPY src/Kyoo.Meilisearch/Kyoo.Meilisearch.csproj src/Kyoo.Meilisearch/Kyoo.Meilisearch.csproj +COPY src/Kyoo.RabbitMq/Kyoo.RabbitMq.csproj src/Kyoo.RabbitMq/Kyoo.RabbitMq.csproj COPY src/Kyoo.Swagger/Kyoo.Swagger.csproj src/Kyoo.Swagger/Kyoo.Swagger.csproj RUN dotnet restore -a $TARGETARCH diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev index 53213cbb..ac2a62e9 100644 --- a/back/Dockerfile.dev +++ b/back/Dockerfile.dev @@ -11,6 +11,7 @@ COPY src/Kyoo.Core/Kyoo.Core.csproj src/Kyoo.Core/Kyoo.Core.csproj COPY src/Kyoo.Host/Kyoo.Host.csproj src/Kyoo.Host/Kyoo.Host.csproj COPY src/Kyoo.Postgresql/Kyoo.Postgresql.csproj src/Kyoo.Postgresql/Kyoo.Postgresql.csproj COPY src/Kyoo.Meilisearch/Kyoo.Meilisearch.csproj src/Kyoo.Meilisearch/Kyoo.Meilisearch.csproj +COPY src/Kyoo.RabbitMq/Kyoo.RabbitMq.csproj src/Kyoo.RabbitMq/Kyoo.RabbitMq.csproj COPY src/Kyoo.Swagger/Kyoo.Swagger.csproj src/Kyoo.Swagger/Kyoo.Swagger.csproj RUN dotnet restore diff --git a/back/src/Kyoo.RabbitMq/RabbitMqModule.cs b/back/src/Kyoo.RabbitMq/RabbitMqModule.cs index 2e7031db..6aaacb55 100644 --- a/back/src/Kyoo.RabbitMq/RabbitMqModule.cs +++ b/back/src/Kyoo.RabbitMq/RabbitMqModule.cs @@ -39,8 +39,9 @@ public class RabbitMqModule(IConfiguration configuration) : IPlugin new() { UserName = configuration.GetValue("RABBITMQ_DEFAULT_USER", "guest"), - Password = configuration.GetValue("RABBITMQ_DEFAULT_USER", "guest"), - HostName = configuration.GetValue("RABBITMQ_HOST", "rabbitmq:5672"), + Password = configuration.GetValue("RABBITMQ_DEFAULT_PASS", "guest"), + HostName = configuration.GetValue("RABBITMQ_HOST", "rabbitmq"), + Port = 5672, }; return factory.CreateConnection();