Skip to content

Commit 8c70b28

Browse files
jpayne3506sivakami
jpayne3506
authored and
sivakami
committed
[deps] ci: Update Mariner to 3.0 (#3606)
* ci: mariner 3.0 * ci: make dockerfiles * ci: add cni/cns pipeline dockerfiles * chore: address comments
1 parent 92c9fa7 commit 8c70b28

File tree

10 files changed

+78
-29
lines changed

10 files changed

+78
-29
lines changed

‎.pipelines/build/dockerfiles/cni.Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
# !! AUTOGENERATED - DO NOT EDIT !!
2+
# SOURCE: .pipelines/build/dockerfiles/cni.Dockerfile.tmpl
13
ARG ARCH
24

3-
4-
# skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
5-
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
5+
# 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
67
ARG ARTIFACT_DIR .
78

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

‎.pipelines/build/dockerfiles/cni.Dockerfile.tmpl‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# {{.RENDER_MSG}}
2+
# SOURCE: {{.SRC_PIPE}}
3+
ARG ARCH
4+
5+
# {{.WIN_HPC_IMG}}
6+
FROM --platform=windows/${ARCH} {{.WIN_HPC_PIN}} AS windows
7+
ARG ARTIFACT_DIR .
8+
9+
COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe
10+
ENTRYPOINT [ "/dropgz.exe" ]
11+
12+
13+
FROM scratch AS linux
14+
ARG ARTIFACT_DIR .
15+
16+
COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz
17+
ENTRYPOINT [ "/dropgz" ]

‎.pipelines/build/dockerfiles/cns.Dockerfile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# !! AUTOGENERATED - DO NOT EDIT !!
2+
# SOURCE: .pipelines/build/dockerfiles/cns.Dockerfile.tmpl
13
ARG ARCH
24

3-
45
# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
56
FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
67
ARG ARTIFACT_DIR .
@@ -11,14 +12,12 @@ COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
1112
ENTRYPOINT ["azure-cns.exe"]
1213
EXPOSE 10090
1314

14-
15-
# mcr.microsoft.com/cbl-mariner/base/core:2.0
16-
# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
17-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS build-helper
15+
# mcr.microsoft.com/azurelinux/base/core:3.0
16+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS build-helper
1817
RUN tdnf install -y iptables
1918

20-
# mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
21-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS linux
19+
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
20+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0801b80a0927309572b9adc99bd1813bc680473175f6e8175cd4124d95dbd50c AS linux
2221
ARG ARTIFACT_DIR .
2322

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

‎.pipelines/build/dockerfiles/cns.Dockerfile.tmpl‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# {{.RENDER_MSG}}
2+
# SOURCE: {{.SRC_PIPE}}
3+
ARG ARCH
4+
5+
# {{.WIN_HPC_IMG}}
6+
FROM --platform=windows/${ARCH} {{.WIN_HPC_PIN}} AS windows
7+
ARG ARTIFACT_DIR .
8+
9+
COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
10+
COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
11+
COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
12+
ENTRYPOINT ["azure-cns.exe"]
13+
EXPOSE 10090
14+
15+
# {{.MARINER_CORE_IMG}}
16+
FROM --platform=linux/${ARCH} {{.MARINER_CORE_PIN}} AS build-helper
17+
RUN tdnf install -y iptables
18+
19+
# {{.MARINER_DISTROLESS_IMG}}
20+
FROM --platform=linux/${ARCH} {{.MARINER_DISTROLESS_PIN}} AS linux
21+
ARG ARTIFACT_DIR .
22+
23+
COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/
24+
COPY --from=build-helper /usr/lib /usr/lib
25+
COPY ${ARTIFACT_DIR}/bin/azure-cns /usr/local/bin/azure-cns
26+
ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
27+
EXPOSE 10090

‎azure-ipam/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ ARG DROPGZ_VERSION=v0.0.12
33
ARG OS_VERSION
44
ARG OS
55

6-
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.23.2-cbl-mariner2.0 --format "{{.Name}}@{{.Digest}}"
7-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:f8613198423d5cb702961f1547f9cb061f8da1c6ca9ce8da4824eb47db663cd7 AS go
6+
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.23.2-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
7+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:f1f0cbd464ae4cd9d41176d47f1f9fe16a6965425871f817587314e3a04576ec AS go
88

9-
# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
10-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:a490e0b0869dc570ae29782c2bc17643aaaad1be102aca83ce0b96e0d0d2d328 AS mariner-core
9+
# skopeo inspect docker://mcr.microsoft.com/azurelinux/base/core:3.0 --format "{{.Name}}@{{.Digest}}"
10+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:b46476be0b5c9691ad20f78871819950c01433bdfad81d72c61618f4a6202b25 AS mariner-core
1111

1212
FROM go AS azure-ipam
1313
ARG OS

‎build/images.mk‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Source images
2-
export GO_IMG ?= mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0
3-
export MARINER_CORE_IMG ?= mcr.microsoft.com/cbl-mariner/base/core:2.0
4-
export MARINER_DISTROLESS_IMG ?= mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
2+
export GO_IMG ?= mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0
3+
export MARINER_CORE_IMG ?= mcr.microsoft.com/azurelinux/base/core:3.0
4+
export MARINER_DISTROLESS_IMG ?= mcr.microsoft.com/azurelinux/distroless/minimal:3.0
55
export WIN_HPC_IMG ?= mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
66

77

@@ -15,6 +15,10 @@ export RENDER_MSG ?= "!! AUTOGENERATED - DO NOT EDIT !!"
1515
export SRC ?= ${PATH}/Dockerfile.tmpl
1616
export DEST ?= ${PATH}/Dockerfile
1717

18+
export PIPE_PATH ?= .pipelines/build/dockerfiles
19+
export SRC_PIPE ?= ${PIPE_PATH}/${PATH}.Dockerfile.tmpl
20+
export DEST_PIPE ?= ${PIPE_PATH}/${PATH}.Dockerfile
21+
1822
print:
1923
@echo ${GO_PIN}
2024
@echo ${MARINER_CORE_PIN}
@@ -23,3 +27,4 @@ print:
2327

2428
render:
2529
build/tools/bin/renderkit -f ${SRC} --ds env:// > ${DEST}
30+
build/tools/bin/renderkit -f ${SRC_PIPE} --ds env:// > ${DEST_PIPE}

‎cni/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG DROPGZ_VERSION=v0.0.12
55
ARG OS_VERSION
66
ARG OS
77

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

11-
# mcr.microsoft.com/cbl-mariner/base/core:2.0
12-
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core
11+
# mcr.microsoft.com/azurelinux/base/core:3.0
12+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS mariner-core
1313

1414
FROM go AS azure-vnet
1515
ARG OS

‎cns/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ ARG ARCH
44
ARG OS_VERSION
55
ARG OS
66

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

10-
# mcr.microsoft.com/cbl-mariner/base/core:2.0
11-
FROM mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core
10+
# mcr.microsoft.com/azurelinux/base/core:3.0
11+
FROM mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS mariner-core
1212

13-
# mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
14-
FROM mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:a2529d152e75b29502a8de264a4f3dfb8fd126d870c9bf4456d03b7a7dab7268 AS mariner-distroless
13+
# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
14+
FROM mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0801b80a0927309572b9adc99bd1813bc680473175f6e8175cd4124d95dbd50c AS mariner-distroless
1515

1616
FROM --platform=linux/${ARCH} go AS builder
1717
ARG OS

‎npm/linux.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23 AS builder
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0 AS builder
22
ARG VERSION
33
ARG NPM_AI_PATH
44
ARG NPM_AI_ID

‎npm/windows.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG OS_VERSION
2-
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23 AS builder
2+
FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0 AS builder
33
ARG VERSION
44
ARG NPM_AI_PATH
55
ARG NPM_AI_ID

0 commit comments

Comments
 (0)