From 5ab28bf6d940e2aa98618190a538f0b01d24779f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Aug 2021 13:45:45 +0200 Subject: [PATCH] new flavours --- .gitignore | 1 + Makefile | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5647482..a697cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ digitaldemocratic.conf docker-compose.yml +devel.yml adminer.yml pgtuner.yml custom/ diff --git a/Makefile b/Makefile index 9bcc516..08a7052 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,11 @@ add-plugins: connect-saml # docker restart isard-sso-keycloak # sleep 10 # docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=$$DDADMIN_PASSWORD && php occ user:add --password-from-env --display-name="DD Admin" --group="admin" $$DDADMIN_USER' - + + # docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=admin && php occ user:delete admin' + # docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=LostAdminGroup && php occ user:add --password-from-env --display-name="Admin" --group="admin" admin' + + # Wordpress ## Multisite docker exec -ti isard-apps-wordpress /bin/sh -c "/multisite.sh" @@ -189,4 +193,13 @@ pgtuner: upgrade-moodle: docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --enable docker exec -ti isard-apps-moodle php7 admin/cli/upgrade.php --non-interactive --allow-unstable - docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --disable \ No newline at end of file + docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --disable + +.PHONY: devel +devel: build + echo CUSTOM_PATH=$(CUSTOM_PATH) > .env + echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso >> .env + docker-compose -f docker-compose.yml \ + -f isard-sso/docker-compose-parts/api.devel.yml \ + -f isard-sso/docker-compose-parts/admin.devel.yml \ + config > devel.yml