From 24de43bd0f293e6f38f5d4c4709b929b807ce1b5 Mon Sep 17 00:00:00 2001 From: Borja Esteban Date: Mon, 1 Jul 2024 10:01:22 +0200 Subject: [PATCH] add backend support for BACKEND_GIT_EMAIL --- .env-example | 1 + backend | 2 +- docker-compose.base.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env-example b/.env-example index 92db09b..1470814 100644 --- a/.env-example +++ b/.env-example @@ -23,6 +23,7 @@ OAUTH_AUTHORITY="https://aai-demo.egi.eu/auth/realms/egi/" PROJECT_NAME=cookiecutter-web REPOSITORY_URL="https://github.com/m-team-kit/templates-hub.git" CORS_ORIGINS="http://localhost,http://localhost:3000,http://localhost:5000,https://localhost" +BACKEND_GIT_EMAIL=info@templates.cloud.ai4eosc.eu NOTIFICATIONS_SENDER=info@templates.cloud.ai4eosc.eu NOTIFICATIONS_TARGET=some.email@example.com diff --git a/backend b/backend index 70e9c92..f605d54 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 70e9c9258d633ee532cd752c591c0776ed795d07 +Subproject commit f605d540e516d73d25625cb19c145ce1721c8226 diff --git a/docker-compose.base.yaml b/docker-compose.base.yaml index 44ccab9..ddeeb19 100644 --- a/docker-compose.base.yaml +++ b/docker-compose.base.yaml @@ -28,6 +28,9 @@ services: build: context: backend dockerfile: dockerfile + args: + GIT_USERNAME: ${PROJECT_NAME?Undefined PROJECT_NAME for git config} + GIT_EMAIL: ${BACKEND_GIT_EMAIL?Undefined BACKEND_GIT_EMAIL for git config} environment: PROJECT_NAME: ${PROJECT_NAME} REPOSITORY_URL: ${REPOSITORY_URL}