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