mirror of
https://github.com/BetterCorp/BetterFrame.git
synced 2026-05-26 19:06:34 +00:00
7d81891b0e
Coolify pulls from GitHub and runs docker compose build — no guaranteed env vars like SOURCE_COMMIT. Previous approach relied on ARG/ENV passthrough that silently defaulted to "dev". Fix: install git in the builder stage, COPY .git into context, run git describe --tags --always to derive the version, write it to /app/server/.bf-version. version.ts reads this file as a fallback between env vars and the "dev" literal. Chain: BF_SERVER_VERSION env → BF_BUILD_VERSION env → .bf-version file → COOLIFY_GIT_COMMIT env → SOURCE_COMMIT env → "dev". Also: fix .gitignore for rauc-signing/ (was under wrong path).
91 lines
2.5 KiB
YAML
91 lines
2.5 KiB
YAML
# BetterFrame Coolify variant — Coolify's Traefik fronts the stack, so
|
|
# no host port is published from the compose. Angie still receives traffic
|
|
# from Traefik on container port 80 (via the betterframe network).
|
|
#
|
|
# Point Coolify resource at this file instead of docker-compose.yml.
|
|
#
|
|
# Same env / volume overrides as the standard compose:
|
|
# BF_DATA_VOLUME_NAME default "betterframe-data"
|
|
# NODERED_DATA_VOLUME_NAME default "nodered-data"
|
|
# BF_DATA_DIR, BF_SQLITE_PATH, BF_NODERED_URL, BF_SELF_URL,
|
|
# BF_FIRMWARE_SIGNING_KEY, BF_MQTT_*
|
|
|
|
version: "3.8"
|
|
|
|
services:
|
|
server:
|
|
build:
|
|
context: .
|
|
dockerfile: deploy/docker/Dockerfile.server
|
|
args:
|
|
BF_SERVER_VERSION: ${BF_SERVER_VERSION:-${COOLIFY_GIT_COMMIT:-${SOURCE_COMMIT:-dev}}}
|
|
container_name: betterframe-server
|
|
restart: unless-stopped
|
|
environment:
|
|
- TZ=UTC
|
|
- BF_DATA_DIR=/var/lib/betterframe
|
|
- BF_SQLITE_PATH=/var/lib/betterframe/betterframe.db
|
|
- BF_NODERED_URL=http://nodered:1880
|
|
- BF_SELF_URL=http://server:18080
|
|
- BF_SERVER_VERSION=${BF_SERVER_VERSION:-${COOLIFY_GIT_COMMIT:-${SOURCE_COMMIT:-dev}}}
|
|
volumes:
|
|
- betterframe-data:/var/lib/betterframe
|
|
expose:
|
|
- "18080"
|
|
- "18081"
|
|
- "18082"
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "wget -qO- http://localhost:18080/healthz || exit 1"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 30s
|
|
networks:
|
|
- betterframe
|
|
|
|
angie:
|
|
build:
|
|
context: .
|
|
dockerfile: deploy/docker/Dockerfile.angie
|
|
container_name: betterframe-angie
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- server
|
|
- nodered
|
|
# No `ports:` — Coolify's Traefik routes ${SERVICE_FQDN_ANGIE_80} → 80.
|
|
expose:
|
|
- "80"
|
|
networks:
|
|
- betterframe
|
|
|
|
nodered:
|
|
build:
|
|
context: .
|
|
dockerfile: deploy/docker/Dockerfile.nodered
|
|
container_name: betterframe-nodered
|
|
restart: unless-stopped
|
|
environment:
|
|
- TZ=UTC
|
|
volumes:
|
|
- nodered-data:/data
|
|
expose:
|
|
- "1880"
|
|
healthcheck:
|
|
# Node-RED root admin path returns 200 once the runtime is up.
|
|
test: ["CMD-SHELL", "wget -q --spider http://localhost:1880/nrdp/ || exit 1"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 90s
|
|
networks:
|
|
- betterframe
|
|
|
|
volumes:
|
|
betterframe-data:
|
|
name: ${BF_DATA_VOLUME_NAME:-betterframe-data}
|
|
nodered-data:
|
|
name: ${NODERED_DATA_VOLUME_NAME:-nodered-data}
|
|
|
|
networks:
|
|
betterframe:
|
|
driver: bridge
|