From f40cd9ba5683f9808a7e6855de4a5ba0a0327397 Mon Sep 17 00:00:00 2001
From: Mukhtar Akere <akeremukhtar10@gmail.com>
Date: Sat, 1 Feb 2025 03:37:37 +0100
Subject: [PATCH] Hotfix: Improve final docker image

---
 Dockerfile | 58 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c43c60..f7eeed3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,49 +1,55 @@
-FROM --platform=$BUILDPLATFORM golang:1.22 as builder
+# Stage 1: Build binaries
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as builder
 
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
 ARG VERSION
 ARG CHANNEL
 
 WORKDIR /app
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download -x
 
-ADD . .
+COPY . .
 
-RUN CGO_ENABLED=0 GOOS=$(echo $TARGETPLATFORM | cut -d '/' -f1) GOARCH=$(echo $TARGETPLATFORM | cut -d '/' -f2) go build \
-    -ldflags="-X github.com/sirrobot01/debrid-blackhole/pkg/version.Version=${VERSION} -X github.com/sirrobot01/debrid-blackhole/pkg/version.Channel=${CHANNEL}" \
+# Build main binary
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
+    go build -trimpath \
+    -ldflags="-w -s -X github.com/sirrobot01/debrid-blackhole/pkg/version.Version=${VERSION} -X github.com/sirrobot01/debrid-blackhole/pkg/version.Channel=${CHANNEL}" \
     -o /blackhole
 
-RUN CGO_ENABLED=0 GOOS=$(echo $TARGETPLATFORM | cut -d '/' -f1) GOARCH=$(echo $TARGETPLATFORM | cut -d '/' -f2) go build \
+# Build healthcheck (optimized)
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
+    go build -trimpath -ldflags="-w -s" \
     -o /healthcheck cmd/healthcheck/main.go
 
-FROM alpine as logsetup
-ARG PUID=1000
-ARG PGID=1000
-RUN addgroup -g $PGID appuser && \
-    adduser -D -u $PUID -G appuser appuser && \
-    mkdir -p /logs && \
+# Stage 2: Create directory structure
+FROM alpine:3.19 as dirsetup
+RUN mkdir -p /logs && \
     chmod 777 /logs && \
     touch /logs/decypharr.log && \
     chmod 666 /logs/decypharr.log
 
-FROM gcr.io/distroless/static-debian12:latest
-COPY --from=builder /blackhole /blackhole
-COPY --from=builder /healthcheck /healthcheck
-COPY --from=logsetup /etc/passwd /etc/passwd
-COPY --from=logsetup /etc/group /etc/group
-COPY --from=logsetup /logs /logs
+# Stage 3: Final image
+FROM gcr.io/distroless/static-debian12:nonroot
 
+# Copy binaries
+COPY --from=builder --chown=nonroot:nonroot /blackhole /blackhole
+COPY --from=builder --chown=nonroot:nonroot /healthcheck /healthcheck
+
+# Copy pre-made directory structure
+COPY --from=dirsetup --chown=nonroot:nonroot /logs /logs
+
+# Metadata
 ENV LOG_PATH=/logs
-
 EXPOSE 8181 8282
-
 VOLUME ["/app"]
-
-USER appuser
-
+USER nonroot:nonroot
 HEALTHCHECK CMD ["/healthcheck"]
-
 CMD ["/blackhole", "--config", "/app/config.json"]
\ No newline at end of file