Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic

.gitignore

@@ -2,3 +2,4 @@ digitaldemocratic.conf
 docker-compose.yml
 **/*.yaml
 custom/
+.env

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,10 +37,14 @@ environment:
 	cp digitaldemocratic.conf docker-compose-parts/.env
 	echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env
 
+.PHONY: build
 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 +52,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 \
@@ -61,12 +67,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 +85,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 +128,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