Dockerfile: fix docker build

Author: aitjcize

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: install
         run: |
           apk update
-          apk add git python3 make gcc linux-headers libc-dev py-pip
+          apk add git python3 make gcc linux-headers libc-dev py-pip node npm
           python3 -m venv .venv
           source .venv/bin/activate
           pip install -r requirements.txt

Dockerfile

@@ -1,26 +1,40 @@
-FROM golang:alpine AS builder
+# Build go app.
+FROM golang:alpine AS gobuilder
 
 RUN mkdir -p /src
 WORKDIR /src
-
 COPY . .
 
 RUN apk update && apk add make gcc linux-headers libc-dev
+RUN make STATIC=true build-go
+
 
-RUN make STATIC=true
+# Build node app.
+FROM node:23-alpine AS nodebuilder
 
+RUN mkdir -p /src
+WORKDIR /src
+COPY . .
+
+RUN apk update && apk add make
+RUN make build-apps
+
+
+# Build final image.
 FROM alpine:latest
 
-RUN mkdir /config /overlord
+RUN mkdir -p /config /app /app/webroot/upgrade
+WORKDIR /app
+
+COPY --from=gobuilder /src/bin/overlordd /app
+COPY --from=gobuilder /src/bin/ghost /app
+COPY --from=gobuilder /src/scripts/start_overlordd.sh /app
+COPY --from=gobuilder /src/bin/ghost /app/webroot/upgrade/ghost.linux.amd64
 
-COPY --from=builder /src/bin/overlordd /overlord
-COPY --from=builder /src/bin/ghost /overlord
-COPY --from=builder /src/overlord/webroot /overlord/webroot
-COPY --from=builder /src/scripts/start_overlordd.sh /overlord
+RUN sha1sum /app/webroot/upgrade/ghost.linux.amd64 | \
+	awk '{ print $1 }' > /app/webroot/upgrade/ghost.linux.amd64.sha1
 
-COPY --from=builder /src/bin/ghost /overlord/app/upgrade/ghost.linux.amd64
-RUN sha1sum /overlord/app/upgrade/ghost.linux.amd64 | \
-	awk '{ print $1 }' > /overlord/app/upgrade/ghost.linux.amd64.sha1
+COPY --from=nodebuilder /src/webroot /app/webroot
 
 ENV SHELL=/bin/sh
 

Makefile

@@ -26,8 +26,8 @@ build: build-bin build-apps
 deps:
 	mkdir -p $(BIN)
 	if $(DEPS); then \
-		cd $(CURDIR)/overlord; \
-		$(GO) get -d .; \
+		cd $(CURDIR); \
+		$(GO) get ./...; \
 	fi
 
 overlordd: deps
@@ -38,7 +38,9 @@ overlordd: deps
 ghost: deps
 	GOBIN=$(BIN) $(GO) install $(LDFLAGS) $(CURDIR)/cmd/$@
 
-py-bin:
+build-go: overlordd ghost
+
+build-bin:
 	mkdir -p $(BUILD)
 	# Create virtualenv environment
 	rm -rf $(BUILD)/.venv
@@ -54,7 +56,6 @@ py-bin:
 	mv $(BUILD)/dist/ovl $(BIN)/ovl.py.bin
 	mv $(BUILD)/dist/ghost $(BIN)/ghost.py.bin
 
-build-bin: overlordd ghost py-bin
 
 go-fmt:
 	$(GO) fmt $(GO_DIRS)
@@ -69,21 +70,21 @@ go-lint:
 
 # Build all apps that have a package.json
 build-apps:
-	@echo "Building apps..."
+	@echo "Building apps ..."
 	@mkdir -p $(APPS_DIR)
 	@cd apps && \
 	for dir in */; do \
 		if [ ! -f "$$dir/package.json" ]; then \
 			continue; \
 		fi; \
-		echo "Building $$dir..."; \
+		echo "Building $$dir ..."; \
 		(cd "$$dir" && npm install && npm run build); \
 		if [ -d "$$dir/dist" ]; then \
-			echo "Copying $$dir dist to apps directory..."; \
+			echo "Copying $$dir dist to apps directory ..."; \
 			mkdir -p $(APPS_DIR)/"$${dir%/}"; \
 			cp -r "$$dir/dist/"* $(APPS_DIR)/"$${dir%/}"/; \
 			if [ "$$dir" = "dashboard/" ]; then \
-				echo "Copying dashboard to webroot..."; \
+				echo "Copying dashboard to webroot ..."; \
 				cp $(APPS_DIR)/dashboard/index.html \
 					$(CURDIR)/webroot/index.html; \
 			fi; \