Skip to content

Commit 1e47702

Browse files
jpayne3506jpayne3506
committed
ci: mariner 3.0
1 parent 8d75d8b commit 1e47702

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎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: 3 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

‎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:ef7a44dce2c01bcbd93c4a9d760ae55c93c6bf6028e123db47d604cecb7e1935 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:b46476be0b5c9691ad20f78871819950c01433bdfad81d72c61618f4a6202b25 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:ef7a44dce2c01bcbd93c4a9d760ae55c93c6bf6028e123db47d604cecb7e1935 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:b46476be0b5c9691ad20f78871819950c01433bdfad81d72c61618f4a6202b25 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:97574c5b2a0554838fdbd31fcc2a1288276b443cee023b743af38caf84b7b427 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)