Skip to content

Commit

Permalink
bring new v1.4 CNI bins to dropgz (#2371)
Browse files Browse the repository at this point in the history
bring new CNI bins to dropgz

Signed-off-by: Evan Baker <[email protected]>
  • Loading branch information
rbtr authored Nov 9, 2023
1 parent 441d94a commit 160000a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions dropgz/build/linux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN tdnf install -y tar
RUN tdnf upgrade -y && tdnf install -y ca-certificates

FROM tar AS azure-ipam
ARG AZIPAM_VERSION=v0.0.3
ARG AZIPAM_VERSION=v0.0.3.1
ARG VERSION
ARG OS
ARG ARCH
Expand All @@ -12,7 +12,7 @@ COPY ./azure-ipam .
RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2F$AZIPAM_VERSION/azure-ipam-$OS-$ARCH-$AZIPAM_VERSION.tgz && tar -xvf azure-ipam-$OS-$ARCH-$AZIPAM_VERSION.tgz

FROM tar AS azure-vnet
ARG AZCNI_VERSION=v1.4.39
ARG AZCNI_VERSION=v1.4.51
ARG VERSION
ARG OS
ARG ARCH
Expand All @@ -35,7 +35,7 @@ COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs
RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done

FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20 AS dropgz
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
ARG VERSION
WORKDIR /dropgz
COPY --from=compressor /dropgz .
Expand Down
4 changes: 2 additions & 2 deletions dropgz/build/windows.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN tdnf install -y unzip
RUN tdnf upgrade -y && tdnf install -y ca-certificates

FROM tar AS azure-vnet
ARG AZCNI_VERSION=v1.5.4
ARG AZCNI_VERSION=v1.4.51
ARG VERSION
ARG OS
ARG ARCH
Expand All @@ -25,7 +25,7 @@ COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry.config p
RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done

FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.20 AS dropgz
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
ARG VERSION
WORKDIR /dropgz
COPY --from=compressor /dropgz .
Expand Down

0 comments on commit 160000a

Please sign in to comment.