Skip to content

Commit 85987cd

Browse files
committed
chore: cleanup rebase
1 parent c8e24d0 commit 85987cd

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
lines changed

.pipelines/build/dockerfiles/cns.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ 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:e9bb4e5a79123f2ae29dc601f68adf63a636a455c4259423712b06b798cb201e AS build-helper
14+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:d472a34802cd535b24ed5fbb7869456e6d8ab2c087faedb9cb32a0efe5b67a15 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:be0e4c34aaa7b369ff84907fa0a743f5d5904fa2d5b7da2e768ad8df285d4213 AS linux
18+
FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:77854f8f49c481de03b8c98a5cfba5066616ca5a0213e2f7d443eb542d0f64c4 AS linux
1919
ARG ARTIFACT_DIR .
2020

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

cni/Dockerfile

Lines changed: 2 additions & 2 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.24-azurelinux3.0
9-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3999f970bb52b7413ef9be2803173d4fd7f1f3c59362a98a0c78d155e3a0e59f AS go
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:6623b87c05c87cf3a213d67f8e917a820227b7fe64582d16deaa8b486a37ef8d AS go
1010

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

1414
FROM go AS azure-vnet
1515
ARG OS

cns/Dockerfile

Lines changed: 3 additions & 3 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.24-azurelinux3.0
8-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:3999f970bb52b7413ef9be2803173d4fd7f1f3c59362a98a0c78d155e3a0e59f AS go
8+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:6623b87c05c87cf3a213d67f8e917a820227b7fe64582d16deaa8b486a37ef8d AS go
99

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

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

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

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/azure-container-networking
22

3-
go 1.24.0
3+
go 1.24.1
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0

tools.go.mod

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
module github.com/Azure/azure-container-networking
22

3-
go 1.24.0
3+
go 1.24.1
44

5-
require (
6-
github.com/AlekSi/gocov-xml v1.2.0
7-
github.com/axw/gocov v1.2.1
8-
github.com/golang/mock v1.6.0
9-
github.com/golangci/golangci-lint v1.63.4
10-
github.com/jstemmer/go-junit-report v1.0.0
11-
github.com/orellazri/renderkit v0.6.3
12-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
13-
google.golang.org/protobuf v1.36.8
14-
mvdan.cc/gofumpt v0.7.0
15-
sigs.k8s.io/controller-tools v0.16.3
165
// To use/update leverage -modfile=tools.go.mod field in respective go commands
176
tool (
187
github.com/golang/mock/mockgen

0 commit comments

Comments
 (0)