From ea533dbd83286cfb986433caca299b1f0a54b106 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 14 Jun 2025 10:08:43 +0200
Subject: [PATCH] use ADD command to clone packages

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 pkg/buildx/Dockerfile             | 4 +---
 pkg/compose/Dockerfile            | 4 +---
 pkg/containerd/Dockerfile         | 8 +-------
 pkg/credential-helpers/Dockerfile | 4 +---
 pkg/docker-cli/Dockerfile         | 4 +---
 pkg/docker-engine/Dockerfile      | 4 +---
 pkg/sbom/Dockerfile               | 4 +---
 pkg/scan/Dockerfile               | 4 +---
 8 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/pkg/buildx/Dockerfile b/pkg/buildx/Dockerfile
index 92266927..1a1167d2 100644
--- a/pkg/buildx/Dockerfile
+++ b/pkg/buildx/Dockerfile
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/buildx \
diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile
index 9da4c048..1abf143e 100644
--- a/pkg/compose/Dockerfile
+++ b/pkg/compose/Dockerfile
@@ -51,11 +51,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/compose \
diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index 4b3e03e5..2eb2a399 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -61,15 +61,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN  <<EOT
-  set -ex
-  git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
-  git checkout -q FETCH_HEAD
-EOT
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/containerd \
diff --git a/pkg/credential-helpers/Dockerfile b/pkg/credential-helpers/Dockerfile
index 34eaddac..8fa38067 100644
--- a/pkg/credential-helpers/Dockerfile
+++ b/pkg/credential-helpers/Dockerfile
@@ -52,11 +52,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/docker-credential-helpers \
diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile
index 9d911ce4..2408869e 100644
--- a/pkg/docker-cli/Dockerfile
+++ b/pkg/docker-cli/Dockerfile
@@ -54,11 +54,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/cli \
diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
index b8002cf1..29c36480 100644
--- a/pkg/docker-engine/Dockerfile
+++ b/pkg/docker-engine/Dockerfile
@@ -51,11 +51,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/engine \
diff --git a/pkg/sbom/Dockerfile b/pkg/sbom/Dockerfile
index acfc4552..519aaa12 100644
--- a/pkg/sbom/Dockerfile
+++ b/pkg/sbom/Dockerfile
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/sbom \
diff --git a/pkg/scan/Dockerfile b/pkg/scan/Dockerfile
index 90c1133f..8dbbdfc3 100644
--- a/pkg/scan/Dockerfile
+++ b/pkg/scan/Dockerfile
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
 RUN apk add --no-cache bash curl file git zip tar
 
 FROM src-base AS src
-WORKDIR /src
 ARG PKG_REPO
-RUN git init . && git remote add origin "${PKG_REPO}"
 ARG PKG_REF
-RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
+ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
 
 FROM src-base AS src-tgz
 RUN --mount=from=src,source=/src,target=/scan \