Skip to content

Commit

Permalink
Fix deployment issues from last PR (#50)
Browse files Browse the repository at this point in the history
* Fix deployment issues from last PR

* use the proper openstack logo
  • Loading branch information
enolfc authored Jun 7, 2024
1 parent 4a4f50d commit b4ebd84
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion cron-update-endpoints
Original file line number Diff line number Diff line change
@@ -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
28 changes: 14 additions & 14 deletions dashboard/dashy_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -104,7 +100,7 @@ def main():
"path": DOCS_URL,
}
],
"logo": "egi-logo.svg",
"logo": "/egi-logo.svg",
},
"appConfig": {
"theme": "material",
Expand All @@ -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")
Expand All @@ -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",
}
Expand Down
8 changes: 2 additions & 6 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,19 @@ 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

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
Expand Down
Binary file removed icons/openstack.ico
Binary file not shown.
File renamed without changes

0 comments on commit b4ebd84

Please sign in to comment.