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 d8ea985fe..25a16c2c8 100644 --- a/backend/open_webui/config.py +++ b/backend/open_webui/config.py @@ -538,10 +538,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/package-lock.json b/package-lock.json index e953bc91d..b8c807f62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "3.2.2", "@sveltejs/adapter-static": "^3.0.2", - "@sveltejs/kit": "^2.5.20", + "@sveltejs/kit": "^2.15.1", "@sveltejs/vite-plugin-svelte": "^3.1.1", "@tailwindcss/typography": "^0.5.13", "@typescript-eslint/eslint-plugin": "^6.17.0", @@ -2260,11 +2260,10 @@ } }, "node_modules/@sveltejs/kit": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.12.1.tgz", - "integrity": "sha512-M3rPijGImeOkI0DBJSwjqz+YFX2DyOf6NzWgHVk3mqpT06dlYCpcv5xh1q4rYEqB58yQlk4QA1Y35PUqnUiFKw==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.15.1.tgz", + "integrity": "sha512-8t7D3hQHbUDMiaQ2RVnjJJ/+Ur4Fn/tkeySJCsHtX346Q9cp3LAnav8xXdfuqYNJwpUGX0x3BqF1uvbmXQw93A==", "hasInstallScript": true, - "license": "MIT", "dependencies": { "@types/cookie": "^0.6.0", "cookie": "^0.6.0", diff --git a/package.json b/package.json index ed988fb60..722594fed 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "3.2.2", "@sveltejs/adapter-static": "^3.0.2", - "@sveltejs/kit": "^2.5.20", + "@sveltejs/kit": "^2.15.1", "@sveltejs/vite-plugin-svelte": "^3.1.1", "@tailwindcss/typography": "^0.5.13", "@typescript-eslint/eslint-plugin": "^6.17.0",