File tree Expand file tree Collapse file tree 4 files changed +8
-35
lines changed Expand file tree Collapse file tree 4 files changed +8
-35
lines changed Original file line number Diff line number Diff line change @@ -376,8 +376,7 @@ azure-ipam-image: ## build azure-ipam container image.
376376 TAG=$(AZURE_IPAM_PLATFORM_TAG ) \
377377 TARGET=$(OS ) \
378378 OS=$(OS ) \
379- ARCH=$(ARCH ) \
380- OS_VERSION=$(OS_VERSION )
379+ ARCH=$(ARCH )
381380
382381azure-ipam-image-push : # # push azure-ipam container image.
383382 $(MAKE ) container-push \
@@ -436,7 +435,6 @@ cni-image: ## build cni container image.
436435 TARGET=$(OS ) \
437436 OS=$(OS ) \
438437 ARCH=$(ARCH ) \
439- OS_VERSION=$(OS_VERSION ) \
440438 EXTRA_BUILD_ARGS=' --build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
441439
442440cni-image-push : # # push cni container image.
@@ -467,8 +465,7 @@ cns-image: ## build cns container image.
467465 TAG=$(CNS_PLATFORM_TAG ) \
468466 TARGET=$(OS ) \
469467 OS=$(OS ) \
470- ARCH=$(ARCH ) \
471- OS_VERSION=$(OS_VERSION )
468+ ARCH=$(ARCH )
472469
473470cns-image-push : # # push cns container image.
474471 $(MAKE ) container-push \
Original file line number Diff line number Diff line change @@ -37,15 +37,7 @@ FROM scratch AS linux
3737COPY --from=dropgz /go/bin/dropgz dropgz
3838ENTRYPOINT [ "/dropgz" ]
3939
40- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2019 --format "{{.Name}}@{{.Digest}}"
41- FROM mcr.microsoft.com/windows/nanoserver@sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 AS ltsc2019
42-
43- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2022 --format "{{.Name}}@{{.Digest}}"
44- FROM mcr.microsoft.com/windows/nanoserver@sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 AS ltsc2022
45-
46- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2025 --format "{{.Name}}@{{.Digest}}" ## 2025 isn't tagged yet
47- FROM mcr.microsoft.com/windows/nanoserver/insider@sha256:67e0ab7f3a79cd73be4a18bae24659c03b294aed0dbeaa624feb3810931f0bd2 AS ltsc2025
48-
49- FROM ${OS_VERSION} AS windows
40+ # skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
41+ FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
5042COPY --from=dropgz /go/bin/dropgz dropgz.exe
5143ENTRYPOINT [ "/dropgz.exe" ]
Original file line number Diff line number Diff line change @@ -51,15 +51,7 @@ FROM scratch AS linux
5151COPY --from=dropgz /go/bin/dropgz dropgz
5252ENTRYPOINT [ "/dropgz" ]
5353
54- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2019 --format "{{.Name}}@{{.Digest}}"
55- FROM mcr.microsoft.com/windows/nanoserver@sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 AS ltsc2019
56-
57- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2022 --format "{{.Name}}@{{.Digest}}"
58- FROM mcr.microsoft.com/windows/nanoserver@sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 AS ltsc2022
59-
60- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2025 --format "{{.Name}}@{{.Digest}}" ## 2025 isn't tagged yet
61- FROM mcr.microsoft.com/windows/nanoserver/insider@sha256:67e0ab7f3a79cd73be4a18bae24659c03b294aed0dbeaa624feb3810931f0bd2 AS ltsc2025
62-
63- FROM ${OS_VERSION} as windows
54+ # skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
55+ FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
6456COPY --from=dropgz /go/bin/dropgz dropgz.exe
6557ENTRYPOINT [ "/dropgz.exe" ]
Original file line number Diff line number Diff line change @@ -30,16 +30,8 @@ COPY --from=builder /go/bin/azure-cns /usr/local/bin/azure-cns
3030ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
3131EXPOSE 10090
3232
33- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2019 --format "{{.Name}}@{{.Digest}}"
34- FROM mcr.microsoft.com/windows/nanoserver@sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 AS ltsc2019
35-
36- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2022 --format "{{.Name}}@{{.Digest}}"
37- FROM mcr.microsoft.com/windows/nanoserver@sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 AS ltsc2022
38-
39- # skopeo inspect --override-os windows docker://mcr.microsoft.com/windows/nanoserver:ltsc2025 --format "{{.Name}}@{{.Digest}}" ## 2025 isn't tagged yet
40- FROM mcr.microsoft.com/windows/nanoserver/insider@sha256:67e0ab7f3a79cd73be4a18bae24659c03b294aed0dbeaa624feb3810931f0bd2 AS ltsc2025
41-
42- FROM ${OS_VERSION} AS windows
33+ # skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
34+ FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
4335COPY --from=builder /azure-container-networking/cns/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
4436COPY --from=builder /azure-container-networking/npm/examples/windows/setkubeconfigpath.ps1 setkubeconfigpath.ps1
4537COPY --from=builder /go/bin/azure-cns /azure-cns.exe
You can’t perform that action at this time.
0 commit comments