From 10fb943d751d19f25789eb0714d177115f394a2f Mon Sep 17 00:00:00 2001
From: firelegacy0 <firelegacy6@gmail.com>
Date: Wed, 8 Nov 2023 17:27:18 +0800
Subject: [PATCH 1/4] Remove pkger as it's read-only

---
 Dockerfile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0e8a3ae..0892e29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,7 @@ ENV GOPROXY https://proxy.golang.org
 
 COPY go.mod go.sum /kubeseal-web/
 
-RUN go mod download \
-    && go get github.com/markbates/pkger/cmd/pkger
+RUN go mod download
 
 FROM --platform=$BUILDPLATFORM dev AS build
 ARG TARGETPLATFORM
@@ -27,12 +26,11 @@ ARG TARGETARCH
 
 COPY ./ /kubeseal-web/
 
-RUN mkdir /build/ \
-    && pkger -include /static/ \
-    && rm -rf /kubeseal-web/static/ \
-    && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v \
-       -ldflags "-s -w" -a -installsuffix cgo \
-       -o /build/kubeseal-web . \
+RUN mkdir /build/ && \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v \
+    -ldflags "-s -w" -a -installsuffix cgo \
+    -o /build/kubeseal-web \
+    /kubeseal-web/ \
     && chmod +x /build/kubeseal-web
 
 FROM --platform=$TARGETPLATFORM alpine:3.12 AS prod
@@ -54,6 +52,5 @@ COPY --from=build /build/kubeseal-web /kubeseal-web/run
 
 ARG BUILD_VERSION
 ENV KSWEB_VERSION $BUILD_VERSION
-ENV GIN_MODE release
 
 ENTRYPOINT ["/kubeseal-web/run"]

From 0ab55c8cb09154a8d837ae2d8821c31057c0fa03 Mon Sep 17 00:00:00 2001
From: firelegacy0 <firelegacy6@gmail.com>
Date: Wed, 8 Nov 2023 17:28:09 +0800
Subject: [PATCH 2/4] Include GIN_MODE release again

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 0892e29..d46721e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,5 +52,6 @@ COPY --from=build /build/kubeseal-web /kubeseal-web/run
 
 ARG BUILD_VERSION
 ENV KSWEB_VERSION $BUILD_VERSION
+ENV GIN_MODE release
 
 ENTRYPOINT ["/kubeseal-web/run"]

From 6e5584f5c17ef33ff7e6c74b6282427013fa4fb2 Mon Sep 17 00:00:00 2001
From: firelegacy0 <firelegacy6@gmail.com>
Date: Wed, 8 Nov 2023 20:11:35 +0800
Subject: [PATCH 3/4] Attempt to specify path for pkger instead

---
 Dockerfile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d46721e..29f1274 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,12 @@ RUN apk add --no-cache build-base curl
 
 ENV GO111MODULE on
 ENV GOPROXY https://proxy.golang.org
+ENV PATH="${PATH}:/go/bin"
 
 COPY go.mod go.sum /kubeseal-web/
 
-RUN go mod download
+RUN go mod download \
+    && go get github.com/markbates/pkger/cmd/pkger
 
 FROM --platform=$BUILDPLATFORM dev AS build
 ARG TARGETPLATFORM
@@ -26,11 +28,14 @@ ARG TARGETARCH
 
 COPY ./ /kubeseal-web/
 
-RUN mkdir /build/ && \
-    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v \
-    -ldflags "-s -w" -a -installsuffix cgo \
-    -o /build/kubeseal-web \
-    /kubeseal-web/ \
+ENV PATH="${PATH}:/go/bin"
+
+RUN mkdir /build/ \
+    && pkger -include /static/ \
+    && rm -rf /kubeseal-web/static/ \
+    && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v \
+       -ldflags "-s -w" -a -installsuffix cgo \
+       -o /build/kubeseal-web . \
     && chmod +x /build/kubeseal-web
 
 FROM --platform=$TARGETPLATFORM alpine:3.12 AS prod
@@ -43,11 +48,6 @@ LABEL org.label-schema.vcs-url="https://github.com/MrSaints/kubeseal-web" \
 
 RUN apk add --no-cache bash ca-certificates curl jq wget nano
 
-RUN wget https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.17.3/kubeseal-0.17.3-linux-${TARGETARCH}.tar.gz -O kubeseal.tar.gz \
-    && tar -xzf kubeseal.tar.gz -C /tmp/ \
-    && install -m 755 /tmp/kubeseal /usr/local/bin/kubeseal \
-    && rm -rf kubeseal.tar.gz /tmp/kubeseal
-
 COPY --from=build /build/kubeseal-web /kubeseal-web/run
 
 ARG BUILD_VERSION

From fa2fbda39cfe4941c77e0108105783c6d468e6a5 Mon Sep 17 00:00:00 2001
From: firelegacy0 <firelegacy6@gmail.com>
Date: Thu, 9 Nov 2023 08:02:53 +0800
Subject: [PATCH 4/4] Re-add missing wget step

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 29f1274..b8e7590 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,11 @@ LABEL org.label-schema.vcs-url="https://github.com/MrSaints/kubeseal-web" \
 
 RUN apk add --no-cache bash ca-certificates curl jq wget nano
 
+RUN wget https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.17.3/kubeseal-0.17.3-linux-${TARGETARCH}.tar.gz -O kubeseal.tar.gz \
+    && tar -xzf kubeseal.tar.gz -C /tmp/ \
+    && install -m 755 /tmp/kubeseal /usr/local/bin/kubeseal \
+    && rm -rf kubeseal.tar.gz /tmp/kubeseal
+    
 COPY --from=build /build/kubeseal-web /kubeseal-web/run
 
 ARG BUILD_VERSION