Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker-compose.yml
This commit is contained in:
Rémi Heredero 2024-02-14 12:03:58 +01:00
commit 4f65a05e10

View File

@ -6,8 +6,6 @@ services:
image: traefik image: traefik
restart: unless-stopped restart: unless-stopped
ports: ports:
# Read this on how to open ports
# https://github.com/chaifeng/ufw-docker
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
@ -77,7 +75,7 @@ services:
ports: ports:
- 80:8080 - 80:8080
environment: environment:
- '/ollama/api=http://ollama:11434/api' - './ollama/api=http://ollama:11434/api'
extra_hosts: extra_hosts:
- host.docker.internal:host-gateway - host.docker.internal:host-gateway
labels: labels: