Skip to content

Commit 57304a4

Browse files
authored
Update dropgz to use azure-ipam release (#1588)
* pack released version of azure-ipam * add cert installation * remove commented lines * remove cilium from dropgz * use azure-ipam/v0.0.3
1 parent feabc22 commit 57304a4

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

dropgz/build/cni.Dockerfile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
1-
FROM mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 as cilium
1+
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS certs
2+
RUN tdnf upgrade -y && tdnf install -y ca-certificates
23

3-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-ipam
4+
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS tar
5+
RUN tdnf install -y tar
6+
7+
FROM tar AS azure-ipam
48
ARG VERSION
9+
ARG OS
10+
ARG ARCH
511
WORKDIR /azure-ipam
612
COPY ./azure-ipam .
7-
RUN CGO_ENABLED=0 go build -a -o bin/azure-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
13+
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
14+
RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.3/azure-ipam-$OS-$ARCH-v0.0.3.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.3.tgz
815

9-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-vnet
16+
FROM tar AS azure-vnet
1017
ARG VERSION
1118
ARG OS
1219
ARG ARCH
1320
WORKDIR /azure-container-networking
1421
COPY . .
15-
RUN curl -LO https://github.com/Azure/azure-container-networking/releases/download/v1.4.29/azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz && tar -xvf azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz
22+
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
23+
RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/v1.4.29/azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz && tar -xvf azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz
1624

1725
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS compressor
1826
ARG OS
1927
WORKDIR /dropgz
2028
COPY dropgz .
2129
COPY --from=azure-ipam /azure-ipam/*.conflist pkg/embed/fs
22-
COPY --from=azure-ipam /azure-ipam/bin/* pkg/embed/fs
30+
COPY --from=azure-ipam /azure-ipam/azure-ipam pkg/embed/fs
2331
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist pkg/embed/fs/azure-swift.conflist
2432
COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs
2533
COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs
2634
COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs
27-
COPY --from=cilium /opt/cni/bin/cilium-cni pkg/embed/fs
2835
RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
2936
RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done
3037

0 commit comments

Comments
 (0)