Build webapp assets during Docker build instead of checking them into git

.dockerignore

@@ -0,0 +1,18 @@
+# Node.js
+webapp/node_modules/
+webapp/build/
+
+# Go
+vendor/
+
+# IDE
+.vscode/
+.idea/
+
+# Build artifacts
+bin/
+dist/
+
+# Test artifacts
+coverage/
+

.gitignore

@@ -25,3 +25,10 @@ debug.html
 git_push.sh
 webapp/src/lib/api/generated/docs
 .env
+
+# Compiled webapp assets (built during Docker build)
+webapp/assets/_app/
+webapp/assets/assets/
+webapp/assets/index.html
+webapp/assets/*.png
+webapp/build/

Dockerfile

@@ -1,3 +1,13 @@
+# Stage 1: Build webapp
+FROM docker.io/node:lts-alpine AS webapp
+
+WORKDIR /build/webapp
+COPY webapp/package.json webapp/package-lock.json ./
+RUN npm ci
+COPY webapp/ ./
+RUN npm run build
+
+# Stage 2: Build Go binaries
 FROM docker.io/golang:alpine AS builder
 ARG GARM_REF
 
@@ -10,6 +20,10 @@ RUN echo ${GARM_REF}
 ADD . /build/garm
 
 RUN git -C /build/garm checkout ${GARM_REF}
+
+# Copy webapp build output to assets directory (after git checkout to override any checked-in assets)
+COPY --from=webapp /build/webapp/build/ /build/garm/webapp/assets/
+
 RUN cd /build/garm \
     && go build -o /bin/garm \
       -tags osusergo,netgo,sqlite_omit_load_extension \

Dockerfile.build-static

@@ -1,3 +1,13 @@
+# Stage 1: Build webapp
+FROM docker.io/node:lts-alpine AS webapp
+
+WORKDIR /build/webapp
+COPY webapp/package.json webapp/package-lock.json ./
+RUN npm ci
+COPY webapp/ ./
+RUN npm run build
+
+# Stage 2: Build Go binaries
 FROM docker.io/golang:alpine
 
 WORKDIR /root
@@ -14,4 +24,7 @@ RUN chmod +x /build-static.sh
 
 ADD . /build/garm
 
+# Copy webapp build output to assets directory
+COPY --from=webapp /build/webapp/build/ /build/garm/webapp/assets/
+
 CMD ["/bin/sh"]

Makefile

@@ -56,10 +56,10 @@ build: ## Build garm
 	@echo Binaries are available in $(PWD)/bin
 
 .PHONY: build-webui
-build-webui:
+build-webui: ## Build GARM web UI (for local development)
 	@echo Building GARM web ui
-	./build-webapp.sh
-	rm -rf webapp/assets/_app
+	./scripts/build-webapp.sh
+	rm -rf webapp/assets/_app webapp/assets/assets webapp/assets/index.html webapp/assets/*.png
 	cp -r webapp/build/* webapp/assets/
 
 .PHONY: generate