BetterCorp/BetterFrame
1
0
Fork 0
mirror of https://github.com/BetterCorp/BetterFrame.git synced 2026-05-26 20:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(docker): remove COPY .git — Coolify excludes it from build context

Browse source 
Coolify doesn't include .git in Docker build context, causing build
failure. Revert to ARG-based version stamping: compose passes
BF_SERVER_VERSION from Coolify's SOURCE_COMMIT/COOLIFY_GIT_COMMIT
env vars as a build arg, Dockerfile writes it to .bf-version. Removed
git from builder apt install (no longer needed).
This commit is contained in:
Mitchell R 2026-05-22 19:30:18 +02:00
parent ee281fc9dc
commit 90a8f256d5
No known key found for this signature in database
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
deploy/docker/Dockerfile.server
View file

@ -5,9 +5,9 @@ FROM node:24-trixie-slim AS builder
WORKDIR /app WORKDIR /app
# Build deps for argon2 + bsb-plugin-cli + git for version stamping # Build deps for argon2 + bsb-plugin-cli
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential python3 git \ build-essential python3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
@ -21,20 +21,15 @@ COPY server ./server
WORKDIR /app/server WORKDIR /app/server
RUN npm run build RUN npm run build
# Derive version from git. Coolify clones the repo with .git intact so
# git describe / rev-parse work. Falls back to package.json version if
# .git is missing (e.g. if a .dockerignore later excludes it).
COPY .git /app/.git
RUN cd /app && \
GIT_VER="$(git describe --tags --always --dirty 2>/dev/null || echo '')" && \
if [ -z "$GIT_VER" ]; then GIT_VER="$(git rev-parse --short HEAD 2>/dev/null || echo '')"; fi && \
if [ -z "$GIT_VER" ]; then GIT_VER="$(node -p 'require("./package.json").version' 2>/dev/null || echo 'dev')"; fi && \
echo "$GIT_VER" > /app/server/.bf-version && \
echo "Baked version: $GIT_VER"
# ---- Runtime image ---- # ---- Runtime image ----
FROM node:24-trixie-slim FROM node:24-trixie-slim
# Version baked at build time. Coolify doesn't include .git in build context
# so we can't derive from git inside Docker. Instead, compose passes it as a
# build arg from SOURCE_COMMIT / COOLIFY_GIT_COMMIT env vars that Coolify
# DOES inject into the build environment.
ARG BF_SERVER_VERSION=dev
# ffmpeg for camera snapshot capture (optional but needed for /admin/entities/:id/snapshot) # ffmpeg for camera snapshot capture (optional but needed for /admin/entities/:id/snapshot)
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates ffmpeg wget \ ca-certificates ffmpeg wget \
@ -53,6 +48,9 @@ COPY --from=builder /app/package.json ./
# runtime (see shared/env-overrides.ts). No host bind mount needed. # runtime (see shared/env-overrides.ts). No host bind mount needed.
COPY deploy/docker/sec-config.yaml /app/server/sec-config.yaml COPY deploy/docker/sec-config.yaml /app/server/sec-config.yaml
# Bake version into a file readable by version.ts at runtime.
RUN echo "$BF_SERVER_VERSION" > /app/server/.bf-version
RUN mkdir -p /var/lib/betterframe && chown betterframe:betterframe /var/lib/betterframe RUN mkdir -p /var/lib/betterframe && chown betterframe:betterframe /var/lib/betterframe
VOLUME /var/lib/betterframe VOLUME /var/lib/betterframe