diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 03dcf8455..74c27fb61 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -6,6 +6,7 @@ on: branches: - main - dev + - custom_name_envvar tags: - v* @@ -14,7 +15,7 @@ env: jobs: build-main-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -111,7 +112,7 @@ jobs: retention-days: 1 build-cuda-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -211,7 +212,7 @@ jobs: retention-days: 1 build-ollama-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -311,7 +312,10 @@ jobs: retention-days: 1 merge-main-images: - runs-on: ubuntu-latest + runs-on: arc-runner-set + permissions: + contents: read + packages: write needs: [build-main-image] steps: # GitHub Packages requires the entire repository name to be in lowercase @@ -365,7 +369,10 @@ jobs: docker buildx imagetools inspect ${{ env.FULL_IMAGE_NAME }}:${{ steps.meta.outputs.version }} merge-cuda-images: - runs-on: ubuntu-latest + runs-on: arc-runner-set + permissions: + contents: read + packages: write needs: [build-cuda-image] steps: # GitHub Packages requires the entire repository name to be in lowercase @@ -421,7 +428,10 @@ jobs: docker buildx imagetools inspect ${{ env.FULL_IMAGE_NAME }}:${{ steps.meta.outputs.version }} merge-ollama-images: - runs-on: ubuntu-latest + runs-on: arc-runner-set + permissions: + contents: read + packages: write needs: [build-ollama-image] steps: # GitHub Packages requires the entire repository name to be in lowercase diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py index c0a0f63b5..763e6b0b7 100644 --- a/backend/open_webui/config.py +++ b/backend/open_webui/config.py @@ -503,10 +503,11 @@ def load_oauth_providers(): #################################### CUSTOM_NAME = os.environ.get("CUSTOM_NAME", "") +OWUI_API_URL = os.environ.get("OWUI_API_URL", "https://api.openwebui.com") if CUSTOM_NAME: try: - r = requests.get(f"https://api.openwebui.com/api/v1/custom/{CUSTOM_NAME}") + r = requests.get(f"{OWUI_API_URL}/api/v1/custom/{CUSTOM_NAME}") data = r.json() if r.ok: if "logo" in data: diff --git a/backend/requirements.txt b/backend/requirements.txt index 79e898c6a..dc287a14c 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -11,7 +11,7 @@ python-jose==3.3.0 passlib[bcrypt]==1.7.4 requests==2.32.3 -aiohttp==3.11.8 +aiohttp==3.11.11 async-timeout aiocache aiofiles diff --git a/pyproject.toml b/pyproject.toml index 0554baa9e..4cab85bf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "passlib[bcrypt]==1.7.4", "requests==2.32.3", - "aiohttp==3.11.8", + "aiohttp==3.11.11", "async-timeout", "aiocache", "aiofiles",