Skip to content

Commit d653e4d

Browse files
committed
fixup! fixup! Use Signed Binaries for Docker Build
1 parent b376377 commit d653e4d

File tree

4 files changed

+10
-29
lines changed

4 files changed

+10
-29
lines changed

.pipelines/build/dockerfiles/azure-ipam.Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,5 @@ ENTRYPOINT [ "/dropgz.exe" ]
1212
FROM scratch AS linux
1313
ARG ARTIFACT_DIR .
1414

15-
RUN ls -la /
16-
RUN ls -la /artifacts
17-
RUN ls -la /__w/1/a
18-
RUN ls -la /${ARTIFACT_DIR}
19-
2015
COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz
2116
ENTRYPOINT [ "/dropgz" ]

.pipelines/build/dockerfiles/cni.Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe
99
ENTRYPOINT [ "/dropgz.exe" ]
1010

1111

12-
# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
13-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:a490e0b0869dc570ae29782c2bc17643aaaad1be102aca83ce0b96e0d0d2d328 AS archive-helper
12+
FROM scratch AS linux
1413
ARG ARTIFACT_DIR .
1514

16-
COPY ${ARTIFACT_DIR}/root_artifact.tar .
17-
RUN tar xvf root_artifact.tar /artifacts/
18-
19-
FROM scratch AS linux
20-
COPY --from=archive-helper /artifacts/bin/dropgz /dropgz
15+
COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz
2116
ENTRYPOINT [ "/dropgz" ]
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
3-
COPY /artifacts/lib/* /lib
4-
COPY /artifacts/bin/ipv6-hp-bpf /ipv6-hp-bpf
5-
COPY /artifacts/bin/nft /usr/sbin/nft
6-
COPY /artifacts/bin/ip /sbin/ip
3+
ARG ARTIFACT_DIR
4+
COPY ${ARTIFACT_DIR}/lib/* /lib
5+
COPY ${ARTIFACT_DIR}/bin/ipv6-hp-bpf /ipv6-hp-bpf
6+
COPY ${ARTIFACT_DIR}/bin/nft /usr/sbin/nft
7+
COPY ${ARTIFACT_DIR}/bin/ip /sbin/ip
78
CMD ["/ipv6-hp-bpf"]

.pipelines/build/dockerfiles/npm.Dockerfile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
ARG ARTIFACT_DIR
2-
3-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 as archive-helper
4-
ARG ARTIFACT_DIR .
5-
6-
RUN ls -la
7-
ADD . .
8-
RUN ls -la
9-
RUN ls -la /
10-
RUN ls -la /
11-
COPY ${ARTIFACT_DIR}/root_artifact.tar .
12-
RUN tar xvf root_artifact.tar /artifacts/
131

142
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 as linux
3+
ARG ARTIFACT_DIR
154

165
RUN apt-get update && \
176
apt-get install -y \
@@ -23,12 +12,13 @@ RUN apt-get update && \
2312
apt-get autoremove -y && \
2413
apt-get clean
2514

26-
COPY --from=archive-helper /artifacts/bin/azure-npm /usr/bin/azure-npm
15+
COPY ${ARTIFACT_DIR}/bin/azure-npm /usr/bin/azure-npm
2716
ENTRYPOINT ["/usr/bin/azure-npm", "start"]
2817

2918

3019
# intermediate for win-ltsc2022
3120
FROM mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as windows
21+
ARG ARTIFACT_DIR
3222

3323
COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
3424
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1

0 commit comments

Comments
 (0)