Skip to content

Commit b376377

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

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

.pipelines/build/dockerfiles/cns.Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ RUN tdnf install -y iptables
2121
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS linux
2222
ARG ARTIFACT_DIR .
2323

24-
RUN ls -la /
25-
RUN ls -la /artifacts
26-
RUN ls -la /__w/1/a
27-
RUN ls -la ${ARTIFACT_DIR}
2824
COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/
2925
COPY --from=build-helper /usr/lib /usr/lib
3026
ADD ${ARTIFACT_DIR}/bin/azure-cns /usr/local/bin/azure-cns
Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
ARG ARTIFACT_DIR
21

3-
# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
4-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:a490e0b0869dc570ae29782c2bc17643aaaad1be102aca83ce0b96e0d0d2d328 AS linux
5-
ARG ARTIFACT_DIR .
6-
7-
ADD . .
8-
#COPY ${ARTIFACT_DIR}/root_artifact.tar .
9-
#RUN tar xvf root_artifact.tar /artifacts/
10-
11-
#FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
12-
#COPY --from=archive-helper /artifacts/lib/* /lib
13-
#COPY --from=archive-helper /artifacts/bin/ipv6-hp-bpf /ipv6-hp-bpf
14-
#COPY --from=archive-helper /artifacts/bin/nft /usr/sbin/nft
15-
#COPY --from=archive-helper /artifacts/bin/ip /sbin/ip
16-
#CMD ["/ipv6-hp-bpf"]
2+
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
7+
CMD ["/ipv6-hp-bpf"]

.pipelines/build/dockerfiles/npm.Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ ARG ARTIFACT_DIR
33
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 as archive-helper
44
ARG ARTIFACT_DIR .
55

6+
RUN ls -la
7+
ADD . .
8+
RUN ls -la
9+
RUN ls -la /
10+
RUN ls -la /
611
COPY ${ARTIFACT_DIR}/root_artifact.tar .
712
RUN tar xvf root_artifact.tar /artifacts/
813

0 commit comments

Comments
 (0)