Merge branch 'main' into dev

This commit is contained in:
Timothy Jaeryang Baek 2023-12-17 20:59:00 -05:00 committed by GitHub
commit 34bd742964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,17 +22,6 @@ services:
restart: unless-stopped
image: ollama/ollama:latest
# Uncomment below for WIP: Auth support
# ollama-webui-db:
# image: mongo
# container_name: ollama-webui-db
# restart: always
# # Make sure to change the username/password!
# environment:
# MONGO_INITDB_ROOT_USERNAME: root
# MONGO_INITDB_ROOT_PASSWORD: example
ollama-webui:
build:
context: .
@ -43,16 +32,10 @@ services:
container_name: ollama-webui
depends_on:
- ollama
# Uncomment below for WIP: Auth support
# - ollama-webui-db
ports:
- 3000:8080
environment:
- "OLLAMA_API_BASE_URL=http://ollama:11434/api"
# Uncomment below for WIP: Auth support
# - "WEBUI_AUTH=TRUE"
# - "WEBUI_DB_URL=mongodb://root:example@ollama-webui-db:27017/"
# - "WEBUI_JWT_SECRET_KEY=SECRET_KEY"
extra_hosts:
- host.docker.internal:host-gateway
restart: unless-stopped