diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml new file mode 100644 index 0000000..55fff53 --- /dev/null +++ b/.github/workflows/publish-image.yaml @@ -0,0 +1,15 @@ +name: Publish frontend/backend images to Ebrains Docker Registry +on: + [workflow_dispatch] + +jobs: + publish_images: + runs-on: ubuntu-latest + steps: + - name: log in + run: | + docker login ${{secrets.EBRAINS_REGISTRY_SERVER}} -u ${{ secrets.DOCKER_REGISTRY_USER }} -p ${{secrets.DOCKER_REGISTRY_PASSWORD}} + - name: build and publish frontend and backend + run: | + make publish + diff --git a/backend/blue_naas/main.py b/backend/blue_naas/main.py index b92c647..b83257e 100644 --- a/backend/blue_naas/main.py +++ b/backend/blue_naas/main.py @@ -7,7 +7,7 @@ from pathlib import Path from random import choice from string import ascii_uppercase -from urllib.parse import urlunsplit +from urllib.parse import urlunsplit, urlparse from zipfile import ZipFile import requests @@ -26,11 +26,14 @@ def _load_from_url(url): try: - zip_url = urlunsplit(('https', - 'object.cscs.ch', - 'v1/AUTH_c0a333ecf7c045809321ce9d9ecdfdea/' + url, - None, - None)) + if urlparse(url).scheme: + zip_url = url + else: + zip_url = urlunsplit(('https', + 'object.cscs.ch', + 'v1/AUTH_c0a333ecf7c045809321ce9d9ecdfdea/' + url, + None, + None)) L.debug('downloading emodel from url: %s', zip_url) response = requests.get(zip_url, stream=True, timeout=10) try: