Skip to content

Commit ed817a5

Browse files
fix: Install packages from mariner 2.0 instead of 1.0 (#2695)
1 parent 1fa7765 commit ed817a5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

cns/linux.Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 AS certs
2-
RUN tdnf upgrade -y && tdnf install -y ca-certificates
3-
41
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder
52
ARG VERSION
63
ARG CNS_AI_PATH
@@ -11,13 +8,12 @@ RUN CGO_ENABLED=0 go build -a -o /usr/local/bin/azure-cns -ldflags "-X main.vers
118
RUN CGO_ENABLED=0 go build -a -o /usr/local/bin/azure-vnet-telemetry -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" cni/telemetry/service/*.go
129

1310
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0
14-
RUN tdnf install -y iptables
11+
RUN tdnf upgrade -y && tdnf install -y ca-certificates iptables
1512
COPY --from=builder /etc/passwd /etc/passwd
1613
COPY --from=builder /etc/group /etc/group
1714
COPY --from=builder /usr/local/bin/azure-cns \
1815
/usr/local/bin/azure-cns
1916
COPY --from=builder /usr/local/bin/azure-vnet-telemetry \
2017
/usr/local/bin/azure-vnet-telemetry
21-
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
2218
ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
2319
EXPOSE 10090

0 commit comments

Comments
 (0)