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

fixed paths

root 2021-05-28 10:59:39 +02:00
parent a6826ec8c3
commit 7787a93a73
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose-parts/api.yml
View File

@ -12,8 +12,7 @@ services:
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
#- ${BUILD_ROOT_PATH}/docker/api/src:/api:rw ## Develop #- ${BUILD_ROOT_PATH}/docker/api/src:/api:rw ## Develop
- ${CUSTOM_PATH}/custom/menu/custom.yaml:/api/custom.yaml - ${CUSTOM_PATH}/custom/menu:/api/menu
- ${CUSTOM_PATH}/custom/menu/system.yaml:/api/system.yaml
- ${CUSTOM_PATH}/custom/img:/api/api/static/img - ${CUSTOM_PATH}/custom/img:/api/api/static/img
- ${DATA_FOLDER}/avatars/:/api/avatars:ro - ${DATA_FOLDER}/avatars/:/api/avatars:ro
restart: unless-stopped restart: unless-stopped

4
docker-compose-parts/keycloak.yml
View File

@ -8,7 +8,9 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ${BUILD_ROOT_PATH}/init/keycloak/jsons:/opt/jboss/keycloak/imports # Uses the environment var! - ${BUILD_ROOT_PATH}/init/keycloak/jsons:/opt/jboss/keycloak/imports # Uses the environment var!
- ${BUILD_ROOT_PATH}/init/keycloak/scripts/:/opt/jboss/startup-scripts/ - ${BUILD_ROOT_PATH}/init/keycloak/scripts/:/opt/jboss/startup-scripts/
- ${CUSTOM_PATH}/custom/system/keycloak/themes:/opt/jboss/keycloak/themes/ # - ${CUSTOM_PATH}/custom/system/keycloak/themes:/opt/jboss/keycloak/themes
- ${CUSTOM_PATH}/custom/system/keycloak/themes/liiibre:/opt/jboss/keycloak/themes/liiibre
- ${CUSTOM_PATH}/custom/system/keycloak/themes/liiibrelite:/opt/jboss/keycloak/themes/liiibrelite
#- ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/:/opt/custom/deployments #- ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/:/opt/custom/deployments
#- ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/:/opt/custom/deployments #- ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/:/opt/custom/deployments
- ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/avatar-minio-extension-bundle/target/avatar-minio-extension-bundle-1.0.1.0-SNAPSHOT.ear:/opt/jboss/keycloak/standalone/deployments/avatar-minio-extension-bundle-1.0.1.0-SNAPSHOT.ear - ${BUILD_ROOT_PATH}/docker/keycloak/extensions/keycloak-avatar-minio-extension/avatar-minio-extension-bundle/target/avatar-minio-extension-bundle-1.0.1.0-SNAPSHOT.ear:/opt/jboss/keycloak/standalone/deployments/avatar-minio-extension-bundle-1.0.1.0-SNAPSHOT.ear

4
docker/api/src/api/lib/menu.py
View File

@ -23,7 +23,7 @@ class Menu():
None None
def gen_header(self): def gen_header(self):
with open(r'system.yaml') as yml: with open(r'menu/system.yaml') as yml:
system=yaml.load(yml, Loader=yaml.FullLoader) system=yaml.load(yml, Loader=yaml.FullLoader)
apps_internal = [] apps_internal = []
for app in system['apps_internal']: for app in system['apps_internal']:
@ -31,7 +31,7 @@ class Menu():
del app['subdomain'] del app['subdomain']
apps_internal.append(app) apps_internal.append(app)
with open(r'custom.yaml') as yml: with open(r'menu/custom.yaml') as yml:
custom=yaml.load(yml, Loader=yaml.FullLoader) custom=yaml.load(yml, Loader=yaml.FullLoader)
custom['background_login']='https://api.'+application.config['DOMAIN']+custom['background_login'] custom['background_login']='https://api.'+application.config['DOMAIN']+custom['background_login']
custom['logo']='https://api.'+application.config['DOMAIN']+custom['logo'] custom['logo']='https://api.'+application.config['DOMAIN']+custom['logo']