From da162f0b000bb814b36095d3a7e9ee261c66d304 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 May 2021 13:49:42 +0200 Subject: [PATCH] fixed customs --- Makefile | 23 +++++++++++++++-------- isard-sso | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 81abfd3..d928252 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,23 @@ export $(shell sed 's/=.*//' digitaldemocratic.conf) VERSION := 0.0.1-rc0 export VERSION -BUILD_ROOT_PATH=$(shell pwd) +CUSTOM_PATH=$(shell pwd) environment: git submodule update --init --recursive - cp custom/menu/* isard-sso/docker/api/src/ - 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/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/menu/* isard-sso/docker/api/src/ + #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/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/ + 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 - 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/mariadb && \ cp isard-apps/.env isard-apps/docker/moodle && \ @@ -24,7 +30,8 @@ environment: cp isard-apps/.env isard-apps/docker/etherpad 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 docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \ diff --git a/isard-sso b/isard-sso index 1cb76d2..68bb687 160000 --- a/isard-sso +++ b/isard-sso @@ -1 +1 @@ -Subproject commit 1cb76d28d4af4035c6fff2ad9ab736b0d581b0d0 +Subproject commit 68bb6874f56c1638848ad631dd8df54eb133f699