fixed paths

docker-compose-parts/api.yml

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

docker-compose-parts/keycloak.yml

@@ -8,7 +8,9 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - ${BUILD_ROOT_PATH}/init/keycloak/jsons:/opt/jboss/keycloak/imports # Uses the environment var!
       - ${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/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

docker/api/src/api/lib/menu.py

@@ -23,7 +23,7 @@ class Menu():
         None
 
     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)
         apps_internal = []
         for app in system['apps_internal']:
@@ -31,7 +31,7 @@ class Menu():
             del app['subdomain']
             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['background_login']='https://api.'+application.config['DOMAIN']+custom['background_login']
         custom['logo']='https://api.'+application.config['DOMAIN']+custom['logo']
@@ -62,4 +62,4 @@ class Menu():
     def get_header(self):
         return self.menudict
         # with open('menu.yaml', 'w') as yml:
-        #     print(yaml.dump(header, yml, allow_unicode=True))
+        #     print(yaml.dump(header, yml, allow_unicode=True))