Remove compose env interpolation and set fixed TZ defaults

This commit is contained in:
Joachim Friberg
2026-03-19 20:58:24 +01:00
parent 18bf5b2736
commit f5580b3be3
6 changed files with 88 additions and 107 deletions
+9 -13
View File
@@ -1,24 +1,20 @@
name: sample-app name: sample-app
x-image:
namespace: ${IMAGE_NAMESPACE:-joafri}
tag: ${IMAGE_TAG:-main}
services: services:
app: app:
image: ${IMAGE_NAMESPACE:-joafri}/sample-app-app:${IMAGE_TAG:-main} image: joafri/sample-app-app:main
container_name: sample-app container_name: sample-app
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
PUID: ${PUID} PUID: "1000"
PGID: ${PGID} PGID: "1000"
WEBUI_PORT: ${WEBUI_PORT:-8080} WEBUI_PORT: "8080"
ports: ports:
- target: 8080 - target: 8080
published: ${WEBUI_PORT:-8080} published: "8080"
protocol: tcp protocol: tcp
volumes: volumes:
@@ -57,10 +53,10 @@ x-casaos:
- amd64 - amd64
- arm64 - arm64
main: app main: app
category: Utilities category: phirna
author: Zima Apps Team author: Zima Apps Team
developer: example developer: example
icon: https://example.invalid/icon.png icon: https://cdn.simpleicons.org/docker
tagline: tagline:
en_US: Replace with a short one-line value proposition en_US: Replace with a short one-line value proposition
description: description:
@@ -68,4 +64,4 @@ x-casaos:
title: title:
en_US: Sample App en_US: Sample App
index: / index: /
port_map: ${WEBUI_PORT:-8080} port_map: "8080"
+27 -31
View File
@@ -1,27 +1,23 @@
name: caddy-autogen name: caddy-autogen
x-image:
namespace: ${IMAGE_NAMESPACE:-joafri}
tag: ${IMAGE_TAG:-main}
services: services:
caddy: caddy:
image: ${IMAGE_NAMESPACE:-joafri}/caddy-autogen-caddy:${IMAGE_TAG:-main} image: joafri/caddy-autogen-caddy:main
build: build:
context: ./caddy context: ./caddy
dockerfile: Dockerfile dockerfile: Dockerfile
container_name: caddy-autogen container_name: caddy-autogen
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
CADDY_ADMIN: ${CADDY_ADMIN:-0.0.0.0:2019} CADDY_ADMIN: 0.0.0.0:2019
CLOUDFLARE_API_TOKEN: ${CLOUDFLARE_API_TOKEN} CLOUDFLARE_API_TOKEN: CHANGE_ME
ports: ports:
- target: 80 - target: 80
published: ${HTTP_PORT:-80} published: 81
protocol: tcp protocol: tcp
- target: 443 - target: 443
published: ${HTTPS_PORT:-443} published: 4431
protocol: tcp protocol: tcp
volumes: volumes:
- type: bind - type: bind
@@ -62,7 +58,7 @@ services:
container_name: caddy-autogen-socket-proxy container_name: caddy-autogen-socket-proxy
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
CONTAINERS: 1 CONTAINERS: 1
EVENTS: 1 EVENTS: 1
INFO: 1 INFO: 1
@@ -84,7 +80,7 @@ services:
- ALL - ALL
discovery-agent: discovery-agent:
image: ${IMAGE_NAMESPACE:-joafri}/caddy-autogen-discovery-agent:${IMAGE_TAG:-main} image: joafri/caddy-autogen-discovery-agent:main
build: build:
context: ./agent context: ./agent
dockerfile: Dockerfile dockerfile: Dockerfile
@@ -94,22 +90,22 @@ services:
- caddy - caddy
- socket-proxy - socket-proxy
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
DOCKER_API_URL: ${DOCKER_API_URL:-http://socket-proxy:2375} DOCKER_API_URL: http://socket-proxy:2375
CADDY_LOAD_URL: ${CADDY_LOAD_URL:-http://caddy:2019/load} CADDY_LOAD_URL: http://caddy:2019/load
BASE_DOMAIN: ${BASE_DOMAIN} BASE_DOMAIN: example.com
WILDCARD_DOMAIN: ${WILDCARD_DOMAIN:-} WILDCARD_DOMAIN: ""
CLOUDFLARE_API_TOKEN: ${CLOUDFLARE_API_TOKEN} CLOUDFLARE_API_TOKEN: CLOUDFLARE_API_TOKEN
CERT_EMAIL: ${CERT_EMAIL:-} CERT_EMAIL: ""
REQUIRE_CLOUDFLARE: ${REQUIRE_CLOUDFLARE:-true} REQUIRE_CLOUDFLARE: false
ALLOW_INTERNAL_TLS_FALLBACK: ${ALLOW_INTERNAL_TLS_FALLBACK:-false} ALLOW_INTERNAL_TLS_FALLBACK: false
ENV_PREFIX: ${ENV_PREFIX:-LABEL_CADDY_} ENV_PREFIX: LABEL_CADDY_
POLL_SECONDS: ${POLL_SECONDS:-15} POLL_SECONDS: 15
CONTAINER_NAME_DENYLIST: ${CONTAINER_NAME_DENYLIST:-caddy-autogen,caddy-autogen-discovery,caddy-autogen-socket-proxy} CONTAINER_NAME_DENYLIST: caddy-autogen,caddy-autogen-discovery,caddy-autogen-socket-proxy
DEFAULT_SCHEME: ${DEFAULT_SCHEME:-http} DEFAULT_SCHEME: http
DEFAULT_PATH: ${DEFAULT_PATH:-/} DEFAULT_PATH: /
DEFAULT_HEALTH_URI: ${DEFAULT_HEALTH_URI:-} DEFAULT_HEALTH_URI:
CONFIG_FILE: ${CONFIG_FILE:-/app/config/defaults.yaml} CONFIG_FILE: /app/config/defaults.yaml
volumes: volumes:
- type: bind - type: bind
source: /DATA/AppData/$AppID/config source: /DATA/AppData/$AppID/config
@@ -150,10 +146,10 @@ x-casaos:
- arm64 - arm64
- arm - arm
main: caddy main: caddy
category: Network category: phirna
author: Zima Apps Team author: Zima Apps Team
developer: Zima Apps Team developer: Zima Apps Team
icon: https://caddyserver.com/resources/images/caddy-circle-lock.svg icon: https://cdn.simpleicons.org/caddy
tagline: tagline:
en_us: Auto-generate Caddy endpoints from running containers en_us: Auto-generate Caddy endpoints from running containers
description: description:
@@ -164,5 +160,5 @@ x-casaos:
title: title:
en_us: Caddy AutoGen en_us: Caddy AutoGen
index: / index: /
port_map: ${HTTPS_PORT:-443} port_map: "443"
scheme: https scheme: https
+10 -14
View File
@@ -1,12 +1,8 @@
name: docker-ip-addr-manager name: docker-ip-addr-manager
x-image:
namespace: ${IMAGE_NAMESPACE:-joafri}
tag: ${IMAGE_TAG:-main}
services: services:
app: app:
image: ${IMAGE_NAMESPACE:-joafri}/docker-ip-addr-manager-app:${IMAGE_TAG:-main} image: joafri/docker-ip-addr-manager-app:main
build: build:
context: ./backend context: ./backend
dockerfile: Dockerfile dockerfile: Dockerfile
@@ -18,11 +14,11 @@ services:
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
APP_PORT: ${APP_PORT:-31810} APP_PORT: "31810"
STATE_FILE: ${STATE_FILE:-/data/entries.json} STATE_FILE: /data/entries.json
DOCKER_API_URL: ${DOCKER_API_URL:-unix:///var/run/docker.sock} DOCKER_API_URL: unix:///var/run/docker.sock
DOCKER_TIMEOUT_SECONDS: ${DOCKER_TIMEOUT_SECONDS:-3} DOCKER_TIMEOUT_SECONDS: "3"
volumes: volumes:
- type: bind - type: bind
source: /DATA/AppData/$AppID/data source: /DATA/AppData/$AppID/data
@@ -52,7 +48,7 @@ services:
container_name: docker-ip-addr-manager-socket-proxy container_name: docker-ip-addr-manager-socket-proxy
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
CONTAINERS: 1 CONTAINERS: 1
INFO: 1 INFO: 1
PING: 1 PING: 1
@@ -82,10 +78,10 @@ x-casaos:
- arm64 - arm64
- arm - arm
main: app main: app
category: Network category: phirna
author: Zima Apps Team author: Zima Apps Team
developer: Zima Apps Team developer: Zima Apps Team
icon: https://www.svgrepo.com/show/49710/network.svg icon: https://cdn.simpleicons.org/docker
tagline: tagline:
en_us: Manage host LAN IP aliases for container port bindings en_us: Manage host LAN IP aliases for container port bindings
description: description:
@@ -96,5 +92,5 @@ x-casaos:
title: title:
en_us: Docker IP Addr Manager en_us: Docker IP Addr Manager
index: / index: /
port_map: ${APP_PORT:-31810} port_map: "31810"
scheme: http scheme: http
+9 -13
View File
@@ -1,9 +1,5 @@
name: steam-headless name: steam-headless
x-image:
namespace: ${IMAGE_NAMESPACE:-joafri}
tag: ${IMAGE_TAG:-main}
services: services:
steam: steam:
image: lscr.io/linuxserver/steam:version-f4f48542@sha256:d7b9fbf302e05ae79248d1171fe9751b354f8397eafa1e13a3df0aa6a75de0b4 image: lscr.io/linuxserver/steam:version-f4f48542@sha256:d7b9fbf302e05ae79248d1171fe9751b354f8397eafa1e13a3df0aa6a75de0b4
@@ -12,18 +8,18 @@ services:
shm_size: "1gb" shm_size: "1gb"
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
PUID: ${PUID} PUID: "1000"
PGID: ${PGID} PGID: "1000"
STEAM_HTTP_PORT: ${STEAM_HTTP_PORT:-3000} STEAM_HTTP_PORT: "3000"
STEAM_HTTPS_PORT: ${STEAM_HTTPS_PORT:-3001} STEAM_HTTPS_PORT: "3001"
ports: ports:
- target: 3000 - target: 3000
published: ${STEAM_HTTP_PORT:-3000} published: "3000"
protocol: tcp protocol: tcp
- target: 3001 - target: 3001
published: ${STEAM_HTTPS_PORT:-3001} published: "3001"
protocol: tcp protocol: tcp
volumes: volumes:
@@ -67,7 +63,7 @@ x-casaos:
architectures: architectures:
- amd64 - amd64
main: steam main: steam
category: Games category: phirna
author: Zima Apps Team author: Zima Apps Team
developer: linuxserver.io developer: linuxserver.io
icon: https://cdn.simpleicons.org/steam icon: https://cdn.simpleicons.org/steam
@@ -81,5 +77,5 @@ x-casaos:
title: title:
en_us: Steam Headless en_us: Steam Headless
index: / index: /
port_map: ${STEAM_HTTPS_PORT:-3001} port_map: "3001"
scheme: https scheme: https
+32 -36
View File
@@ -1,27 +1,23 @@
name: steam-moonlight name: steam-moonlight
x-image:
namespace: ${IMAGE_NAMESPACE:-joafri}
tag: ${IMAGE_TAG:-main}
x-steam-common: &steam-common x-steam-common: &steam-common
image: josh5/steam-headless:debian-0.2.0@sha256:540366bee31297c5679a5006a84dbca039ca62aaab695852b51b5f62dffd2c14 image: josh5/steam-headless:debian-0.2.0@sha256:540366bee31297c5679a5006a84dbca039ca62aaab695852b51b5f62dffd2c14
restart: unless-stopped restart: unless-stopped
shm_size: ${SHM_SIZE:-2G} shm_size: "2G"
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
PUID: ${PUID} PUID: "1000"
PGID: ${PGID} PGID: "1000"
UMASK: ${UMASK:-000} UMASK: "000"
USER_PASSWORD: ${USER_PASSWORD:-change-me} USER_PASSWORD: change-me
MODE: ${MODE:-primary} MODE: primary
WEB_UI_MODE: ${WEB_UI_MODE:-vnc} WEB_UI_MODE: vnc
PORT_NOVNC_WEB: ${STEAM_WEB_PORT:-8083} PORT_NOVNC_WEB: "8083"
ENABLE_STEAM: ${ENABLE_STEAM:-true} ENABLE_STEAM: "true"
STEAM_ARGS: ${STEAM_ARGS:--silent} STEAM_ARGS: -silent
ENABLE_SUNSHINE: ${ENABLE_SUNSHINE:-false} ENABLE_SUNSHINE: "false"
SUNSHINE_USER: ${SUNSHINE_USER:-admin} SUNSHINE_USER: admin
SUNSHINE_PASS: ${SUNSHINE_PASS:-change-me} SUNSHINE_PASS: change-me
services: services:
steam: steam:
@@ -33,7 +29,7 @@ services:
- ALL - ALL
ports: ports:
- target: 8083 - target: 8083
published: ${STEAM_WEB_PORT:-8083} published: "8083"
protocol: tcp protocol: tcp
volumes: volumes:
- type: bind - type: bind
@@ -87,24 +83,24 @@ services:
devices: devices:
- /dev/fuse - /dev/fuse
- /dev/uinput - /dev/uinput
- ${GPU_CARD_DEVICE:-/dev/dri/card0} - /dev/dri/card0
- ${GPU_RENDER_DEVICE:-/dev/dri/renderD128} - /dev/dri/renderD128
device_cgroup_rules: device_cgroup_rules:
- 'c 13:* rmw' - 'c 13:* rmw'
environment: environment:
TZ: ${TZ} TZ: Europe/Stockholm
PUID: ${PUID} PUID: "1000"
PGID: ${PGID} PGID: "1000"
UMASK: ${UMASK:-000} UMASK: "000"
USER_PASSWORD: ${USER_PASSWORD:-change-me} USER_PASSWORD: change-me
MODE: ${MODE:-primary} MODE: primary
WEB_UI_MODE: ${WEB_UI_MODE:-vnc} WEB_UI_MODE: vnc
PORT_NOVNC_WEB: ${STEAM_WEB_PORT:-8083} PORT_NOVNC_WEB: "8083"
ENABLE_STEAM: ${ENABLE_STEAM:-true} ENABLE_STEAM: "true"
STEAM_ARGS: ${STEAM_ARGS:--silent} STEAM_ARGS: -silent
ENABLE_SUNSHINE: "true" ENABLE_SUNSHINE: "true"
SUNSHINE_USER: ${SUNSHINE_USER:-admin} SUNSHINE_USER: admin
SUNSHINE_PASS: ${SUNSHINE_PASS:-change-me} SUNSHINE_PASS: change-me
volumes: volumes:
- type: bind - type: bind
source: /DATA/AppData/$AppID/moonlight-home source: /DATA/AppData/$AppID/moonlight-home
@@ -117,10 +113,10 @@ x-casaos:
architectures: architectures:
- amd64 - amd64
main: steam main: steam
category: Games category: phirna
author: Zima Apps Team author: Zima Apps Team
developer: Steam-Headless community developer: Steam-Headless community
icon: https://cdn.simpleicons.org/steam icon: https://moonlight-stream.org/images/moonlight.svg
tagline: tagline:
en_us: Steam web desktop with optional Moonlight profile en_us: Steam web desktop with optional Moonlight profile
description: description:
@@ -131,5 +127,5 @@ x-casaos:
title: title:
en_us: Steam Moonlight (Scaffold) en_us: Steam Moonlight (Scaffold)
index: / index: /
port_map: ${STEAM_WEB_PORT:-8083} port_map: "8083"
scheme: http scheme: http
+1
View File
@@ -1,4 +1,5 @@
[ [
"phirna",
"Utilities", "Utilities",
"Developer", "Developer",
"Media", "Media",