From 1172e91c11ad53dc15f0b18779ffa34279e51b73 Mon Sep 17 00:00:00 2001
From: ddvk <36803246+ddvk@users.noreply.github.com>
Date: Sat, 23 Nov 2024 15:31:05 +0100
Subject: [PATCH] dockhub build

---
 .github/workflows/dockerhub.yml | 5 ++++-
 Dockerfile                      | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 42e03255..48035e52 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -43,7 +43,10 @@ jobs:
           tags: |
             ddvk/rmfakecloud:latest
             ddvk/rmfakecloud:${{ env.image_version }}
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: 
+            - linux/amd64
+            - linux/arm/v7
+            - linux/arm64
           build-args: |
             VERSION=${{ env.version }}
 
diff --git a/Dockerfile b/Dockerfile
index 16b28f67..2ae0b5ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG VERSION=0.0.0
-FROM --platform=$BUILDPLATFORM node:lts-slim AS uibuilder
+FROM --platform=$BUILDPLATFORM node:lts AS uibuilder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable pnpm && corepack install -g pnpm@latest-9
@@ -11,12 +11,12 @@ WORKDIR /src
 COPY ui .
 RUN pnpm install && pnpm build
 
-FROM golang:1-alpine AS gobuilder
+FROM golang:bookworm AS gobuilder
 ARG VERSION
 WORKDIR /src
 COPY . .
 COPY --from=uibuilder /src/dist ./ui/dist
-RUN apk add git
+#RUN apk add git
 RUN go generate ./... && CGO_ENABLED=0 go build -ldflags "-s -w -X main.version=${VERSION}" -o rmfakecloud-docker ./cmd/rmfakecloud/
 
 FROM scratch