From 8699d165927d3e9f57028c3f34d9bdee6362bc42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@bona.gent>
Date: Wed, 19 May 2021 18:14:02 +0200
Subject: [PATCH 1/2] 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 \

From b048557c099496bebebc196fa73424a66832aa60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@bona.gent>
Date: Wed, 19 May 2021 19:09:24 +0200
Subject: [PATCH 2/2] PHONY Makefile recipes

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index 868612f..0785b77 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ export VERSION
 
 CUSTOM_PATH=$(shell pwd)
 
+.PHONY: environment
 environment:
 	git submodule update --init --recursive
 	#cp custom/menu/* isard-sso/docker/api/src/
@@ -36,6 +37,7 @@ environment:
 	cp digitaldemocratic.conf docker-compose-parts/.env
 	echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env
 
+.PHONY: build
 build: environment
 	docker-compose 	-f docker-compose-parts/backup.yml \
 					-f docker-compose-parts/admin.yml \
@@ -61,12 +63,15 @@ build: environment
 	rm dd.yml sso.yml apps.yml
 	docker-compose build
 
+.PHONY: up
 up: build
 	docker-compose up -d --no-deps
 
+.PHONY: down
 down:
 	docker-compose down
 
+.PHONY: remove
 remove: down
 	rm -rf /opt/digitaldemocratic/postgres
 	rm -rf /opt/digitaldemocratic/redis
@@ -76,6 +81,7 @@ remove: down
 	rm -rf /opt/digitaldemocratic/freeipa
 	# Leaves haproxy folder with certificates. Remove manually to get new certificates.
 
+.PHONY: add-plugins
 add-plugins:
 	# Nextcloud
 	#cp -R $$BUILD_ROOT_PATH/isard-apps/docker/nextcloud/themes/* $$DATA_FOLDER/nextcloud/themes/
@@ -118,5 +124,6 @@ add-plugins:
 	## Multisite
 	docker exec -ti isard-apps-wordpress /bin/sh -c "/multisite.sh"
 
+.PHONY: connect-saml
 connect-saml:
 	while [ "`docker inspect -f {{.State.Health.Status}} isard-apps-moodle`" != "healthy" ]; do     sleep 2; done