diff --git a/cron-update-endpoints b/cron-update-endpoints index 4899260..ece69cf 100644 --- a/cron-update-endpoints +++ b/cron-update-endpoints @@ -1 +1 @@ -*/15 * * * * root /usr/local/bin/python /fedcloud-dashboard/dashboard/dashy_endpoints.py > /app/public/conf.yml +*/15 * * * * root /usr/local/bin/python /fedcloud-dashboard/dashboard/dashy_endpoints.py > /app/user-data/conf.yml diff --git a/dashboard/dashy_endpoints.py b/dashboard/dashy_endpoints.py index aa65709..63cffa9 100644 --- a/dashboard/dashy_endpoints.py +++ b/dashboard/dashy_endpoints.py @@ -11,10 +11,6 @@ import yaml from defusedxml import ElementTree -DEFAULT_ICON = ( - "https://github.com/openstack/openstackdocstheme/blob/master" - "/openstackdocstheme/theme/openstackdocs/static/favicon.ico?raw=true" -) GOCDB_PUBLICURL = "https://goc.egi.eu/gocdbpi/public/" DOCS_URL = "https://docs.egi.eu/users/compute/cloud-compute/openstack/" TIMEOUT = 10 @@ -104,7 +100,7 @@ def main(): "path": DOCS_URL, } ], - "logo": "egi-logo.svg", + "logo": "/egi-logo.svg", }, "appConfig": { "theme": "material", @@ -114,15 +110,19 @@ def main(): "disableConfiguration": True, }, "sections": [ - {"name": "OpenStack Dashboards", "icon": "fas fa-clouds", "items": []} + { + "name": "OpenStack Dashboards", + "icon": "fas fa-clouds", + "items": [], + "displayData": { + "sortBy": "alphabetical", + "rows": 1, + "cols": 1, + "collapsed": False, + "hideForGuests": False, + }, + }, ], - "displayData": { - "sortBy": "alphabetical", - "rows": 1, - "cols": 1, - "collapsed": False, - "hideForGuests": False, - }, } try: endpoints = find_endpoints("org.openstack.horizon") @@ -132,7 +132,7 @@ def main(): { "title": s[0], "description": f"{s[3]} ({s[4]})", - "icon": "openstack.ico", + "icon": "openstack.png", "url": s[2], "target": "newtab", } diff --git a/docker-compose.yaml b/docker-compose.yaml index bde1bd1..6ca631e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -40,8 +40,7 @@ services: - "traefik.http.routers.dashboard.entrypoints=websecure" - "traefik.http.routers.dashboard.tls.certresolver=myresolver" volumes: - - "config:/app/public" - - "/fedcloud-dashboard/icons:/app/user-data/item-icons/" + - "/fedcloud-dashboard/user-data:/app/user-data/" deploy: restart_policy: condition: any @@ -49,14 +48,11 @@ services: endpoint_updater: build: . volumes: - - "config:/app/public" + - "/fedcloud-dashboard/user-data:/app/user-data/" deploy: restart_policy: condition: any -volumes: - config: - networks: default: driver: bridge diff --git a/icons/openstack.ico b/icons/openstack.ico deleted file mode 100644 index 869705d..0000000 Binary files a/icons/openstack.ico and /dev/null differ diff --git a/icons/egi-logo.svg b/user-data/egi-logo.svg similarity index 100% rename from icons/egi-logo.svg rename to user-data/egi-logo.svg