From a10f65a51f0cc8dc145fe3ddd23a0062bdf4ade1 Mon Sep 17 00:00:00 2001 From: Laurent Bossavit Date: Wed, 13 Nov 2024 15:20:02 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A(ci)=20call=20the=20Dimail=20contai?= =?UTF-8?q?ner=20by=20its=20actual=20name=20(and=20port)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that E2E tests in Github Actions can connect to Dimail container. Previously we were attempting to connect as if from the outside. But the E2E process is in fact inside the Docker Compose network. ("The tests came from inside the house !") https://tvtropes.org/pmwiki/pmwiki.php/Main/TheCallsAreComingFromInsideTheHouse --- .../mailbox_manager/management/commands/setup_dimail_db.py | 2 +- src/backend/people/settings.py | 2 +- src/helm/env.d/dev/values.desk.yaml.gotmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/mailbox_manager/management/commands/setup_dimail_db.py b/src/backend/mailbox_manager/management/commands/setup_dimail_db.py index be0e19e..e2dfb06 100644 --- a/src/backend/mailbox_manager/management/commands/setup_dimail_db.py +++ b/src/backend/mailbox_manager/management/commands/setup_dimail_db.py @@ -13,7 +13,7 @@ from mailbox_manager.models import MailDomain User = get_user_model() -DIMAIL_URL = "http://host.docker.internal:8001" +DIMAIL_URL = "http://dimail:8000" admin = {"username": "admin", "password": "admin"} regie = {"username": "la_regie", "password": "password"} diff --git a/src/backend/people/settings.py b/src/backend/people/settings.py index 836405e..be19a29 100755 --- a/src/backend/people/settings.py +++ b/src/backend/people/settings.py @@ -432,7 +432,7 @@ class Base(Configuration): environ_prefix=None, ) MAIL_PROVISIONING_API_URL = values.Value( - default="http://host.docker.internal:8001", + default="http://dimail:8000", environ_name="MAIL_PROVISIONING_API_URL", environ_prefix=None, ) diff --git a/src/helm/env.d/dev/values.desk.yaml.gotmpl b/src/helm/env.d/dev/values.desk.yaml.gotmpl index ba20901..748b6cf 100644 --- a/src/helm/env.d/dev/values.desk.yaml.gotmpl +++ b/src/helm/env.d/dev/values.desk.yaml.gotmpl @@ -52,7 +52,7 @@ backend: POSTGRES_PASSWORD: pass REDIS_URL: redis://default:pass@redis-master:6379/1 WEBMAIL_URL: "https://onestendev.yapasdewebmail.fr" - MAIL_PROVISIONING_API_URL: "http://host.docker.internal:8001" + MAIL_PROVISIONING_API_URL: "http://dimail:8000" MAIL_PROVISIONING_API_CREDENTIALS: secretKeyRef: name: backend