Skip to content

Commit f446217

Browse files
committed
fix: Build Docker files
1 parent de798b6 commit f446217

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.pipelines/build/dockerfiles/cni.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG ARCH
44

55
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
6-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
6+
FROM --platform=windows/${ARCH} AS windows
77
ARG ARTIFACT_DIR .
88

99
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe

.pipelines/build/dockerfiles/cns.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
ARG ARCH
44

55
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
6-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
6+
FROM --platform=windows/${ARCH} AS windows
77
ARG ARTIFACT_DIR .
88

99
COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
1010
ENTRYPOINT ["azure-cns.exe"]
1111
EXPOSE 10090
1212

1313
# mcr.microsoft.com/azurelinux/base/core:3.0
14-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:c09a4e011a092a45b5c46ac5633253eb1e1106df028912b89cbe225d9061ef0b AS build-helper
14+
FROM --platform=linux/${ARCH} AS build-helper
1515
RUN tdnf install -y iptables
1616

1717
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
18-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:c37100f358ee19e62c60673c54fb43b83d43b2c305846e44b23b2e032e9caf30 AS linux
18+
FROM --platform=linux/${ARCH} AS linux
1919
ARG ARTIFACT_DIR .
2020

2121
COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/

cni/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ARG OS_VERSION
66
ARG OS
77

88
# mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0
9-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:be1960a292d887e8c4e7e412d330f05feb7736e40a3706d8ad14d8009425cf2d AS go
9+
FROM --platform=linux/${ARCH} AS go
1010

1111
# mcr.microsoft.com/azurelinux/base/core:3.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:c09a4e011a092a45b5c46ac5633253eb1e1106df028912b89cbe225d9061ef0b AS mariner-core
12+
FROM --platform=linux/${ARCH} AS mariner-core
1313

1414
FROM go AS azure-vnet
1515
ARG OS
@@ -54,7 +54,7 @@ COPY --from=dropgz /go/bin/dropgz dropgz
5454
ENTRYPOINT [ "/dropgz" ]
5555

5656
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
57-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as hpc
57+
FROM --platform=windows/${ARCH} as hpc
5858

5959
FROM hpc as windows
6060
COPY --from=dropgz /go/bin/dropgz dropgz.exe

cns/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ ARG OS_VERSION
55
ARG OS
66

77
# mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0
8-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:be1960a292d887e8c4e7e412d330f05feb7736e40a3706d8ad14d8009425cf2d AS go
8+
FROM --platform=linux/${ARCH} AS go
99

1010
# mcr.microsoft.com/azurelinux/base/core:3.0
11-
FROM mcr.microsoft.com/azurelinux/base/core@sha256:c09a4e011a092a45b5c46ac5633253eb1e1106df028912b89cbe225d9061ef0b AS mariner-core
11+
FROM AS mariner-core
1212

1313
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
14-
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:c37100f358ee19e62c60673c54fb43b83d43b2c305846e44b23b2e032e9caf30 AS mariner-distroless
14+
FROM AS mariner-distroless
1515

1616
FROM --platform=linux/${ARCH} go AS builder
1717
ARG OS
@@ -33,7 +33,7 @@ ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
3333
EXPOSE 10090
3434

3535
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
36-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as hpc
36+
FROM --platform=windows/${ARCH} as hpc
3737

3838
FROM hpc as windows
3939
COPY --from=builder /go/bin/azure-cns /azure-cns.exe

0 commit comments

Comments
 (0)