From 30e9ba6214ee9403a18e0639e7394c49805c24b5 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 14:51:18 -0800 Subject: [PATCH 1/9] Adds OWUI_API_URL --- backend/open_webui/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: From 521e28dbec03684f2ef193200b8fb98db0ba95d3 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 14:53:44 -0800 Subject: [PATCH 2/9] Updates github workflow --- .github/workflows/build-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 443d90419..7a2f1cb44 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -4,6 +4,7 @@ on: push: branches: - main # or whatever branch you want to use + - custom_name_envvar jobs: release: From 54004513e05e1c64405b249fdddd6909efe448f8 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 15:38:46 -0800 Subject: [PATCH 3/9] Switch to only building docker --- .github/workflows/build-release.yml | 1 - .github/workflows/docker-build.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 7a2f1cb44..443d90419 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -4,7 +4,6 @@ on: push: branches: - main # or whatever branch you want to use - - custom_name_envvar jobs: release: diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 03dcf8455..779590fc6 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* From 77bfc88729a9c1d568d4a2ccc09c71c265f4c3f8 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 15:54:22 -0800 Subject: [PATCH 4/9] Trigger on pull-request --- .github/workflows/docker-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 779590fc6..a0133f479 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -9,6 +9,7 @@ on: - custom_name_envvar tags: - v* + pull_request: env: REGISTRY: ghcr.io From acf94db9cc6d239ac80a511d49b86c45f2f5bdba Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 16:19:20 -0800 Subject: [PATCH 5/9] Adds permissions to publish images --- .github/workflows/docker-build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index a0133f479..6d08eaa56 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -9,7 +9,10 @@ on: - custom_name_envvar tags: - v* - pull_request: + +permissions: + contents: write + packages: write env: REGISTRY: ghcr.io From 57879f8b5f6307b129a64857c35974c7f76b72bd Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 18:44:11 -0800 Subject: [PATCH 6/9] Run on arc-runner-set --- .github/workflows/docker-build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 6d08eaa56..4727be426 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -19,7 +19,7 @@ env: jobs: build-main-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -116,7 +116,7 @@ jobs: retention-days: 1 build-cuda-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -216,7 +216,7 @@ jobs: retention-days: 1 build-ollama-image: - runs-on: ubuntu-latest + runs-on: arc-runner-set permissions: contents: read packages: write @@ -316,7 +316,7 @@ jobs: retention-days: 1 merge-main-images: - runs-on: ubuntu-latest + runs-on: arc-runner-set needs: [build-main-image] steps: # GitHub Packages requires the entire repository name to be in lowercase @@ -370,7 +370,7 @@ 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 needs: [build-cuda-image] steps: # GitHub Packages requires the entire repository name to be in lowercase @@ -426,7 +426,7 @@ 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 needs: [build-ollama-image] steps: # GitHub Packages requires the entire repository name to be in lowercase From 3105430a516d566481fc3dd55700433f4e772162 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 18:53:57 -0800 Subject: [PATCH 7/9] Remove redundant permissions --- .github/workflows/docker-build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 4727be426..135c4625b 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -10,10 +10,6 @@ on: tags: - v* -permissions: - contents: write - packages: write - env: REGISTRY: ghcr.io From b829943f7f69d37b23b4d59bec43c7f2e2eb5221 Mon Sep 17 00:00:00 2001 From: Feynman Liang Date: Wed, 6 Nov 2024 20:16:13 -0800 Subject: [PATCH 8/9] Adds permissions for merge tasks --- .github/workflows/docker-build.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 135c4625b..74c27fb61 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -313,6 +313,9 @@ jobs: merge-main-images: 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 @@ -367,6 +370,9 @@ jobs: merge-cuda-images: 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 @@ -423,6 +429,9 @@ jobs: merge-ollama-images: 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 From 66ca1b213a50e7c32bc27ca45ef6d4fe7e2e41b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:56:45 +0000 Subject: [PATCH 9/9] build(deps-dev): bump @sveltejs/kit Bumps the npm_and_yarn group with 1 update in the / directory: [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit). Updates `@sveltejs/kit` from 2.12.1 to 2.15.1 - [Release notes](https://github.com/sveltejs/kit/releases) - [Changelog](https://github.com/sveltejs/kit/blob/main/packages/kit/CHANGELOG.md) - [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@2.15.1/packages/kit) --- updated-dependencies: - dependency-name: "@sveltejs/kit" dependency-type: direct:development dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) 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",