diff --git a/dd-ctl b/dd-ctl index 2220195..0525f42 100755 --- a/dd-ctl +++ b/dd-ctl @@ -11,6 +11,7 @@ if [ -z "$OPERATION" ]; then echo " Update repository: ./dd-ctl repo-update [branch-name] (defaults to master)" echo " Bring the current project up: ./dd-ctl all" echo " Build the compose files: ./dd-ctl build" + echo " Build the compose files: ./dd-ctl build-develop" echo " Start the project when stopped: ./dd-ctl up" echo " Stop the project when started: ./dd-ctl down" echo " Apply customizations: ./dd-ctl customize" @@ -37,7 +38,7 @@ update_repo(){ cd isard-sso && git fetch && git reset --hard origin/$BRANCH && cd .. } -build(){ +build_compose(){ ## Prepare apps environment cp .env isard-apps/.env echo "CUSTOM_PATH=$CUSTOM_PATH" >> isard-apps/.env @@ -88,9 +89,33 @@ build(){ config > apps.yml docker-compose -f sso.yml -f apps.yml config > docker-compose.yml rm sso.yml apps.yml +} + +build(){ + build_compose docker-compose build } +build_compose_develop(){ + build_compose + ## Prepare sso environment + cp .env isard-sso/.env + echo "CUSTOM_PATH=$CUSTOM_PATH" >> isard-sso/.env + echo "BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso" >> isard-sso/.env + cp isard-sso/.env isard-sso/docker-compose-parts/.env + + # Build compose ymls + echo CUSTOM_PATH=$CUSTOM_PATH > .env + echo BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso >> .env + + # 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 +} + up(){ docker-compose up -d } @@ -251,15 +276,6 @@ extras_pgtuner(){ echo " --> Generated pgtuner.yml" } -extras_develop(){ - 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 -} - upgrade_plugins_moodle(){ wait_for_moodle rm -rf /tmp/moodle @@ -354,6 +370,10 @@ if [ "$OPERATION" = "build" ]; then build fi +if [ "$OPERATION" = "build-devel" ]; then + build_compose_develop +fi + if [ "$OPERATION" = "up" ]; then up fi diff --git a/digitaldemocratic.conf.sample b/digitaldemocratic.conf.sample index 5f165c1..5848765 100644 --- a/digitaldemocratic.conf.sample +++ b/digitaldemocratic.conf.sample @@ -131,4 +131,8 @@ WORDPRESS_IMG=wordpress:5.7.2-php7.4-apache WORDPRESS_CLI_IMG=wordpress:cli-2.5.0-php7.4 ## KEYCLOAK -KEYCLOAK_IMG=quay.io/keycloak/keycloak:13.0.1 \ No newline at end of file +KEYCLOAK_IMG=quay.io/keycloak/keycloak:13.0.1 + +## ETHERPAD +ETHERPAD_IMG=node:lts +ETHERPAD_VERSION=1.8.15 \ No newline at end of file diff --git a/isard-apps b/isard-apps index cb96478..566f36e 160000 --- a/isard-apps +++ b/isard-apps @@ -1 +1 @@ -Subproject commit cb96478a2ddf977fb394e3e4b117be16b47f9773 +Subproject commit 566f36eee61efbddbdce5af85129fb3f61a1876c