Skip to content

Commit a8c393d

Browse files
committed
fixup! fixup! Use Signed Binaries for Docker Build
1 parent d8d9356 commit a8c393d

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG ARCH
22

3-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
3+
4+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal:3.0 AS linux
45
ARG ARTIFACT_DIR
56
COPY ${ARTIFACT_DIR}/lib/* /lib
67
COPY ${ARTIFACT_DIR}/bin/ipv6-hp-bpf /ipv6-hp-bpf

.pipelines/build/dockerfiles/npm.Dockerfile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
ARG ARCH
12

2-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 as linux
3+
4+
# intermediate for win-ltsc2022
5+
FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as windows
6+
ARG ARTIFACT_DIR
7+
8+
COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
9+
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
10+
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath-capz.ps1 setkubeconfigpath-capz.ps1
11+
COPY ${ARTIFACT_DIR}/bin/azure-npm.exe npm.exe
12+
13+
CMD ["npm.exe", "start" "--kubeconfig=.\\kubeconfig"]
14+
15+
16+
FROM --platform=linux/${ARCH} mcr.microsoft.com/mirror/docker/library/ubuntu:22.04 as linux
317
ARG ARTIFACT_DIR
418

519
RUN apt-get update && \
@@ -14,15 +28,3 @@ RUN apt-get update && \
1428

1529
COPY ${ARTIFACT_DIR}/bin/azure-npm /usr/bin/azure-npm
1630
ENTRYPOINT ["/usr/bin/azure-npm", "start"]
17-
18-
19-
# intermediate for win-ltsc2022
20-
FROM mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as windows
21-
ARG ARTIFACT_DIR
22-
23-
COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
24-
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
25-
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath-capz.ps1 setkubeconfigpath-capz.ps1
26-
COPY ${ARTIFACT_DIR}/bin/azure-npm.exe npm.exe
27-
28-
CMD ["npm.exe", "start" "--kubeconfig=.\\kubeconfig"]

0 commit comments

Comments
 (0)