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

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

root 2021-05-21 18:44:38 +02:00
parent 6138e9c65b a4a417ecee
commit 974e5419c7
2 changed files with 12 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

11
Makefile
View File

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