From 8699d165927d3e9f57028c3f34d9bdee6362bc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= Date: Wed, 19 May 2021 18:14:02 +0200 Subject: [PATCH] Fix docker-compose config enviroment --- .gitignore | 1 + Makefile | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 6496581..05f8835 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ digitaldemocratic.conf docker-compose.yml **/*.yaml custom/ +.env diff --git a/Makefile b/Makefile index 868612f..ce13c5a 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,12 @@ environment: echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env build: environment + echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso > .env docker-compose -f docker-compose-parts/backup.yml \ -f docker-compose-parts/admin.yml \ config > dd.yml + echo CUSTOM_PATH=$(CUSTOM_PATH) > .env + echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso >> .env docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \ -f isard-sso/docker-compose-parts/api.yml \ -f isard-sso/docker-compose-parts/keycloak.yml \ @@ -47,6 +50,7 @@ build: environment -f isard-apps/docker/postgresql/postgresql.yml \ config > sso.yml #-f isard-sso/docker-compose-parts/freeipa.yml + echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-apps > .env docker-compose -f isard-apps/docker/moodle/moodle.yml \ -f isard-apps/docker/nextcloud/nextcloud.yml \ -f isard-apps/docker/wordpress/wordpress.yml \