From 4614b1a2a1c09695bbdd23feaec8f3ab00bd2562 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Wed, 10 Jan 2024 09:23:46 +0100
Subject: [PATCH] Improve build #2213

---
 tools/k8spacket/Dockerfile.template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/tools/k8spacket/Dockerfile.template b/tools/k8spacket/Dockerfile.template
index 63392e56b4..1126c2d074 100644
--- a/tools/k8spacket/Dockerfile.template
+++ b/tools/k8spacket/Dockerfile.template
@@ -1,6 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM golang:1.21.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 AS build
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
+COPY --link --from=go / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install \
@@ -15,14 +22,5 @@ ARG version
 ENV GOPROXY=direct
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/k8spacket/k8spacket .
-go build -o /usr/local/bin/k8spacket .
+go build -o "${prefix}/bin/k8spacket" .
 EOF
-
-FROM nicholasdille/ubuntu:22.04 AS prepare
-COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
-    /etc/profile.d/ \
-    /etc/profile.d/
-SHELL [ "bash", "-clo", "errexit" ]
-ARG name
-ARG version
-COPY --from=build /usr/local/bin/k8spacket /uniget_bootstrap/bin/