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>
56 lines
2.8 KiB
YAML
56 lines
2.8 KiB
YAML
networks:
|
|
DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
external: true
|
|
|
|
services:
|
|
gluetun-service: #LIBREPORTAL|SERVICE_TAG_1|gluetun-service
|
|
container_name: gluetun-service
|
|
image: qmcgaw/gluetun:latest #LIBREPORTAL|GLUETUN_VERSION_TAG|latest
|
|
restart: unless-stopped
|
|
hostname: gluetun
|
|
cap_add:
|
|
- NET_ADMIN
|
|
devices:
|
|
- /dev/net/tun:/dev/net/tun
|
|
environment:
|
|
- TZ=TIMEZONE_DATA #LIBREPORTAL|TIMEZONE_TAG|TIMEZONE_DATA
|
|
- VPN_SERVICE_PROVIDER=GLUETUN_VPN_SERVICE_PROVIDER_DATA #LIBREPORTAL|GLUETUN_VPN_SERVICE_PROVIDER_TAG|GLUETUN_VPN_SERVICE_PROVIDER_DATA
|
|
- VPN_TYPE=GLUETUN_VPN_TYPE_DATA #LIBREPORTAL|GLUETUN_VPN_TYPE_TAG|GLUETUN_VPN_TYPE_DATA
|
|
- SERVER_COUNTRIES=GLUETUN_VPN_COUNTRIES_DATA #LIBREPORTAL|GLUETUN_VPN_COUNTRIES_TAG|GLUETUN_VPN_COUNTRIES_DATA
|
|
- OPENVPN_USER=GLUETUN_OPENVPN_USER_DATA #LIBREPORTAL|GLUETUN_OPENVPN_USER_TAG|GLUETUN_OPENVPN_USER_DATA
|
|
- OPENVPN_PASSWORD=GLUETUN_OPENVPN_PASSWORD_DATA #LIBREPORTAL|GLUETUN_OPENVPN_PASSWORD_TAG|GLUETUN_OPENVPN_PASSWORD_DATA
|
|
- WIREGUARD_PRIVATE_KEY=GLUETUN_WIREGUARD_PRIVATE_KEY_DATA #LIBREPORTAL|GLUETUN_WIREGUARD_PRIVATE_KEY_TAG|GLUETUN_WIREGUARD_PRIVATE_KEY_DATA
|
|
- WIREGUARD_ADDRESSES=GLUETUN_WIREGUARD_ADDRESSES_DATA #LIBREPORTAL|GLUETUN_WIREGUARD_ADDRESSES_TAG|GLUETUN_WIREGUARD_ADDRESSES_DATA
|
|
- HTTP_CONTROL_SERVER_AUTH_FILE_PATH=/gluetun/auth/config.toml
|
|
- HEALTH_TARGET_ADDRESSES=GLUETUN_HEALTH_TARGETS_DATA #LIBREPORTAL|GLUETUN_HEALTH_TARGETS_TAG|GLUETUN_HEALTH_TARGETS_DATA
|
|
- HEALTH_ICMP_TARGET_IPS=GLUETUN_HEALTH_ICMP_IPS_DATA #LIBREPORTAL|GLUETUN_HEALTH_ICMP_IPS_TAG|GLUETUN_HEALTH_ICMP_IPS_DATA
|
|
volumes:
|
|
- SOCKET_DATA #LIBREPORTAL|SOCKET_TAG|SOCKET_DATA
|
|
- ./gluetun-data:/gluetun
|
|
ports:
|
|
- "PORTS_DATA_1" #LIBREPORTAL|PORTS_TAG_1|PORTS_DATA_1
|
|
# GLUETUN_FORWARDED_PORTS_BEGIN
|
|
# GLUETUN_FORWARDED_PORTS_END
|
|
labels:
|
|
libreportal.category: "CATEGORY_DATA" #LIBREPORTAL|CATEGORY_TAG|CATEGORY_DATA
|
|
libreportal.title: "TITLE_DATA" #LIBREPORTAL|TITLE_TAG|TITLE_DATA
|
|
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
|
|
|
|
# >>> libreportal-monitoring >>>
|
|
#gluetun-exporter:
|
|
# container_name: gluetun-exporter
|
|
# image: damianr1/gluetun-exporter:latest
|
|
# restart: unless-stopped
|
|
# depends_on:
|
|
# - gluetun-service
|
|
# environment:
|
|
# - GLUETUN_API_URL=http://gluetun-service:8000
|
|
# - LISTEN_ADDRESS=:PORT_INTERNAL_DATA_2 #LIBREPORTAL|PORT_INTERNAL_TAG_2|PORT_INTERNAL_DATA_2
|
|
# networks:
|
|
# DOCKER_NETWORK_DATA: #LIBREPORTAL|DOCKER_NETWORK_TAG|DOCKER_NETWORK_DATA
|
|
# <<< libreportal-monitoring <<<
|