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

fixed customs

root 2021-05-19 13:49:42 +02:00
parent 234aa84e74
commit da162f0b00
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -5,17 +5,23 @@ export $(shell sed 's/=.*//' digitaldemocratic.conf)
VERSION := 0.0.1-rc0 VERSION := 0.0.1-rc0
export VERSION export VERSION
BUILD_ROOT_PATH=$(shell pwd) CUSTOM_PATH=$(shell pwd)
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/
cp custom/img/* isard-sso/docker/api/src/api/static/img/ #cp custom/img/* isard-sso/docker/api/src/api/static/img/
cp custom/login/logo.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/logo.png #cp custom/login/logo.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/logo.png
cp custom/login/background.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/loginBG.png #cp custom/login/background.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/loginBG.png
cp custom/login/style.css isard-sso/docker/keycloak/themes/liiibrelite/login/resources/css/ #cp custom/login/style.css isard-sso/docker/keycloak/themes/liiibrelite/login/resources/css/
mkdir -p custom/system/keycloak
cp -R isard-sso/docker/keycloak/themes custom/system/keycloak/
cp custom/login/logo.png custom/system/keycloak/themes/liiibrelite/login/resources/img/logo.png
cp custom/login/background.png custom/system/keycloak/themes/liiibrelite/login/resources/img/loginBG.png
cp custom/login/style.css custom/system/keycloak/themes/liiibrelite/login/resources/css/
cp digitaldemocratic.conf isard-apps/.env cp digitaldemocratic.conf isard-apps/.env
echo "BUILD_ROOT_PATH=$(BUILD_ROOT_PATH)/isard-apps" >> isard-apps/.env echo "CUSTOM_PATH=$(CUSTOM_PATH)" >> isard-apps/.env
echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-apps" >> isard-apps/.env
cp isard-apps/.env isard-apps/docker/postgresql && \ cp isard-apps/.env isard-apps/docker/postgresql && \
cp isard-apps/.env isard-apps/docker/mariadb && \ cp isard-apps/.env isard-apps/docker/mariadb && \
cp isard-apps/.env isard-apps/docker/moodle && \ cp isard-apps/.env isard-apps/docker/moodle && \
@ -24,7 +30,8 @@ environment:
cp isard-apps/.env isard-apps/docker/etherpad cp isard-apps/.env isard-apps/docker/etherpad
cp digitaldemocratic.conf isard-sso/docker-compose-parts/.env cp digitaldemocratic.conf isard-sso/docker-compose-parts/.env
echo "BUILD_ROOT_PATH=$(BUILD_ROOT_PATH)/isard-sso" >> isard-sso/docker-compose-parts/.env echo "CUSTOM_PATH=$(CUSTOM_PATH)" >> isard-sso/docker-compose-parts/.env
echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso" >> isard-sso/docker-compose-parts/.env
build: environment build: environment
docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \ docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \

2
isard-sso

@ -1 +1 @@
Subproject commit 1cb76d28d4af4035c6fff2ad9ab736b0d581b0d0 Subproject commit 68bb6874f56c1638848ad631dd8df54eb133f699