Remove compose env interpolation and set fixed TZ defaults

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