Skip to content

build(deps-dev): bump @sveltejs/kit from 2.12.1 to 2.15.1 in the npm_and_yarn group across 1 directory #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 9 commits into
base: custom_name_envvar
Choose a base branch
from
Open

build(deps-dev): bump @sveltejs/kit from 2.12.1 to 2.15.1 in the npm_and_yarn group across 1 directory #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
30e9ba6
Adds OWUI_API_URL
feynmanliang Nov 6, 2024
521e28d
Updates github workflow
feynmanliang Nov 6, 2024
5400451
Switch to only building docker
feynmanliang Nov 6, 2024
77bfc88
Trigger on pull-request
feynmanliang Nov 6, 2024
acf94db
Adds permissions to publish images
feynmanliang Nov 7, 2024
57879f8
Run on arc-runner-set
feynmanliang Nov 7, 2024
3105430
Remove redundant permissions
feynmanliang Nov 7, 2024
b829943
Adds permissions for merge tasks
feynmanliang Nov 7, 2024
66ca1b2
build(deps-dev): bump @sveltejs/kit
dependabot[bot] Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions .github/workflows/docker-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- main
- dev
- custom_name_envvar
tags:
- v*

Expand All @@ -14,7 +15,7 @@ env:

jobs:
build-main-image:
runs-on: ubuntu-latest
runs-on: arc-runner-set
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion backend/open_webui/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down