Skip to content

Commit ea533db

Browse files
crazy-maxcrazy-max
committed
use ADD command to clone packages
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent b70b47f commit ea533db

File tree

8 files changed

+8
-28
lines changed

8 files changed

+8
-28
lines changed

‎pkg/buildx/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
4848
RUN apk add --no-cache bash curl file git zip tar
4949

5050
FROM src-base AS src
51-
WORKDIR /src
5251
ARG PKG_REPO
53-
RUN git init . && git remote add origin "${PKG_REPO}"
5452
ARG PKG_REF
55-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
53+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
5654

5755
FROM src-base AS src-tgz
5856
RUN --mount=from=src,source=/src,target=/buildx \

‎pkg/compose/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
5151
RUN apk add --no-cache bash curl file git zip tar
5252

5353
FROM src-base AS src
54-
WORKDIR /src
5554
ARG PKG_REPO
56-
RUN git init . && git remote add origin "${PKG_REPO}"
5755
ARG PKG_REF
58-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
56+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
5957

6058
FROM src-base AS src-tgz
6159
RUN --mount=from=src,source=/src,target=/compose \

‎pkg/containerd/Dockerfile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
6161
RUN apk add --no-cache bash curl file git zip tar
6262

6363
FROM src-base AS src
64-
WORKDIR /src
6564
ARG PKG_REPO
66-
RUN git init . && git remote add origin "${PKG_REPO}"
6765
ARG PKG_REF
68-
RUN <<EOT
69-
set -ex
70-
git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
71-
git checkout -q FETCH_HEAD
72-
EOT
66+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
7367

7468
FROM src-base AS src-tgz
7569
RUN --mount=from=src,source=/src,target=/containerd \

‎pkg/credential-helpers/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
5252
RUN apk add --no-cache bash curl file git zip tar
5353

5454
FROM src-base AS src
55-
WORKDIR /src
5655
ARG PKG_REPO
57-
RUN git init . && git remote add origin "${PKG_REPO}"
5856
ARG PKG_REF
59-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
57+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
6058

6159
FROM src-base AS src-tgz
6260
RUN --mount=from=src,source=/src,target=/docker-credential-helpers \

‎pkg/docker-cli/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
5454
RUN apk add --no-cache bash curl file git zip tar
5555

5656
FROM src-base AS src
57-
WORKDIR /src
5857
ARG PKG_REPO
59-
RUN git init . && git remote add origin "${PKG_REPO}"
6058
ARG PKG_REF
61-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
59+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
6260

6361
FROM src-base AS src-tgz
6462
RUN --mount=from=src,source=/src,target=/cli \

‎pkg/docker-engine/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
5151
RUN apk add --no-cache bash curl file git zip tar
5252

5353
FROM src-base AS src
54-
WORKDIR /src
5554
ARG PKG_REPO
56-
RUN git init . && git remote add origin "${PKG_REPO}"
5755
ARG PKG_REF
58-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
56+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
5957

6058
FROM src-base AS src-tgz
6159
RUN --mount=from=src,source=/src,target=/engine \

‎pkg/sbom/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
4848
RUN apk add --no-cache bash curl file git zip tar
4949

5050
FROM src-base AS src
51-
WORKDIR /src
5251
ARG PKG_REPO
53-
RUN git init . && git remote add origin "${PKG_REPO}"
5452
ARG PKG_REF
55-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
53+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
5654

5755
FROM src-base AS src-tgz
5856
RUN --mount=from=src,source=/src,target=/sbom \

‎pkg/scan/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ FROM --platform=$BUILDPLATFORM alpine AS src-base
4848
RUN apk add --no-cache bash curl file git zip tar
4949

5050
FROM src-base AS src
51-
WORKDIR /src
5251
ARG PKG_REPO
53-
RUN git init . && git remote add origin "${PKG_REPO}"
5452
ARG PKG_REF
55-
RUN git fetch origin "${PKG_REF}" +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
53+
ADD --keep-git-dir=true "${PKG_REPO}#${PKG_REF}" /src
5654

5755
FROM src-base AS src-tgz
5856
RUN --mount=from=src,source=/src,target=/scan \

0 commit comments

Comments
 (0)