56102ac5c0
Add a `#LIBREPORTAL|<APP>_VERSION_TAG|<current-tag>` sentinel to each app's anchor (`<slug>-service`) image line, so a `CFG_<APP>_VERSION` config drives that tag through the existing tagging system — the config becomes the source, the compose tag is derived (like ports/IPs/domains already are). This is the "install/pin a specific version" knob. - Placeholder is the literal current tag (e.g. `31-fpm-alpine`), NOT a `*_DATA` token: an unset var leaves the line untouched (inert comment, keeps the real tag) and never trips the up_app stale-tag scanner. - Only the anchor line is tagged (sidecars mariadb/redis/nginx stay tracked-by-digest, not user-version-picked). ollama correctly targets `ollama/ollama`, not the companion open-webui. - Untagged anchors normalized to `:latest` (semantic no-op) so they're templatable too. The manager (libreportal) is skipped — it updates via its release channel, not a docker tag. 32 apps wired. Verified: CFG_NEXTCLOUD_VERSION=32 → `nextcloud:32` (prefix preserved, idempotent, sidecars untouched); all compose files still valid YAML. Inert until a version config is set, so no behaviour change on existing installs. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
74 lines
3.3 KiB
YAML
Executable File
74 lines
3.3 KiB
YAML
Executable File
networks:
|
|
DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
external: true
|
|
|
|
services:
|
|
ollama-webui: #LIBREPORTAL|SERVICE_TAG_1|ollama-webui
|
|
container_name: ollama-webui
|
|
image: ghcr.io/open-webui/open-webui:main
|
|
restart: unless-stopped
|
|
hostname: ollama-open-webui
|
|
ports:
|
|
- "PORTS_DATA_1" #LIBREPORTAL|PORTS_TAG_1|PORTS_DATA_1
|
|
environment:
|
|
- OLLAMA_BASE_URL=http://IP_DATA_1:PORT_INTERNAL_DATA_2 #LIBREPORTAL|IP_TAG_1|IP_DATA_1 #LIBREPORTAL|PORT_INTERNAL_TAG_2|PORT_INTERNAL_DATA_2
|
|
- OLLAMA_API_BASE_URL=http://IP_DATA_1:PORT_INTERNAL_DATA_2 #LIBREPORTAL|IP_TAG_1|IP_DATA_1 #LIBREPORTAL|PORT_INTERNAL_TAG_2|PORT_INTERNAL_DATA_2
|
|
depends_on:
|
|
- ollama-service
|
|
labels:
|
|
libreportal.category: "CATEGORY_DATA" #LIBREPORTAL|CATEGORY_TAG|CATEGORY_DATA
|
|
libreportal.title: "TITLE_DATA" #LIBREPORTAL|TITLE_TAG|TITLE_DATA
|
|
traefik.enable: TRAEFIK_ENABLE_DATA #LIBREPORTAL|TRAEFIK_ENABLE_TAG|TRAEFIK_ENABLE_DATA
|
|
# TRAEFIK_PORT_1_BEGIN
|
|
traefik.http.routers.ollama-webui.entrypoints: web,websecure
|
|
traefik.http.routers.ollama-webui.rule: Host(`DOMAINSUBNAME_DATA_1`) #LIBREPORTAL|DOMAINSUBNAME_TAG_1|DOMAINSUBNAME_DATA_1
|
|
traefik.http.routers.ollama-webui.tls: true
|
|
traefik.http.routers.ollama-webui.tls.certresolver: production
|
|
traefik.http.services.ollama-webui.loadbalancer.server.port: PORT_INTERNAL_DATA_1 #LIBREPORTAL|PORT_INTERNAL_TAG_1|PORT_INTERNAL_DATA_1
|
|
traefik.http.routers.ollama-webui.middlewares: MIDDLEWARE_DATA_1 #LIBREPORTAL|MIDDLEWARE_TAG_1|MIDDLEWARE_DATA_1
|
|
# TRAEFIK_PORT_1_END
|
|
healthcheck:
|
|
disable: HEALTHCHECK_DATA #LIBREPORTAL|HEALTHCHECK_TAG|HEALTHCHECK_DATA
|
|
networks:
|
|
DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
ipv4_address: IP_DATA_1 #LIBREPORTAL|IP_TAG_1|IP_DATA_1
|
|
|
|
ollama-service: #LIBREPORTAL|SERVICE_TAG_2|ollama-service
|
|
container_name: ollama-service
|
|
image: ollama/ollama:latest #LIBREPORTAL|OLLAMA_VERSION_TAG|latest
|
|
restart: unless-stopped
|
|
hostname: ollama
|
|
# GLUETUN_OFF_BEGIN
|
|
ports:
|
|
- "PORTS_DATA_2" #LIBREPORTAL|PORTS_TAG_2|PORTS_DATA_2
|
|
# GLUETUN_OFF_END
|
|
environment:
|
|
- OLLAMA_HOST=0.0.0.0
|
|
volumes:
|
|
- SOCKET_DATA #LIBREPORTAL|SOCKET_TAG|SOCKET_DATA
|
|
- "./data:/root/.ollama"
|
|
healthcheck:
|
|
disable: HEALTHCHECK_DATA #LIBREPORTAL|HEALTHCHECK_TAG|HEALTHCHECK_DATA
|
|
# GLUETUN_OFF_BEGIN
|
|
networks:
|
|
DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
ipv4_address: IP_DATA_2 #LIBREPORTAL|IP_TAG_2|IP_DATA_2
|
|
# GLUETUN_OFF_END
|
|
# GLUETUN_ON_BEGIN
|
|
# network_mode: "container:gluetun-service"
|
|
# GLUETUN_ON_END
|
|
|
|
# >>> libreportal-monitoring >>>
|
|
#ollama-exporter:
|
|
# container_name: ollama-exporter
|
|
# image: ricardbejarano/ollama-exporter:latest
|
|
# restart: unless-stopped
|
|
# depends_on:
|
|
# - ollama-service
|
|
# environment:
|
|
# - OLLAMA_BASE_URL=http://ollama-service:PORT_INTERNAL_DATA_2 #LIBREPORTAL|PORT_INTERNAL_TAG_2|PORT_INTERNAL_DATA_2
|
|
# - LISTEN=:PORT_INTERNAL_DATA_3 #LIBREPORTAL|PORT_INTERNAL_TAG_3|PORT_INTERNAL_DATA_3
|
|
# networks:
|
|
# DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
# <<< libreportal-monitoring <<<
|