EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_docker-compose_config_environment' into 'master' 

Fix docker-compose config enviroment

See merge request digitaldemocratic/digitaldemocratic!1
Josep Maria Viñolas Auquer 2021-05-20 03:56:23 +00:00
parent 9f3952dc86 8699d16592
commit a1042c89a8
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

4
Makefile
View File

@ -37,9 +37,12 @@ environment:
echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env
build: environment build: environment
echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso > .env
docker-compose -f docker-compose-parts/backup.yml \ docker-compose -f docker-compose-parts/backup.yml \
-f docker-compose-parts/admin.yml \ -f docker-compose-parts/admin.yml \
config > dd.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 \ docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \
-f isard-sso/docker-compose-parts/api.yml \ -f isard-sso/docker-compose-parts/api.yml \
-f isard-sso/docker-compose-parts/keycloak.yml \ -f isard-sso/docker-compose-parts/keycloak.yml \
@ -47,6 +50,7 @@ build: environment
-f isard-apps/docker/postgresql/postgresql.yml \ -f isard-apps/docker/postgresql/postgresql.yml \
config > sso.yml config > sso.yml
#-f isard-sso/docker-compose-parts/freeipa.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 \ docker-compose -f isard-apps/docker/moodle/moodle.yml \
-f isard-apps/docker/nextcloud/nextcloud.yml \ -f isard-apps/docker/nextcloud/nextcloud.yml \
-f isard-apps/docker/wordpress/wordpress.yml \ -f isard-apps/docker/wordpress/wordpress.yml \