From fe2b09e34d19f5abff390e41cf10a2f66e0e6d0a Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:09:55 -0700 Subject: [PATCH 1/2] removing cert container from cniInstaller --- dropgz/build/cni.Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index de55d6d916..00e7c53c8e 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -1,8 +1,6 @@ -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS certs -RUN tdnf upgrade -y && tdnf install -y ca-certificates - FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS tar RUN tdnf install -y tar +RUN tdnf upgrade -y && tdnf install -y ca-certificates FROM tar AS azure-ipam ARG VERSION @@ -10,7 +8,7 @@ ARG OS ARG ARCH WORKDIR /azure-ipam COPY ./azure-ipam . -COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=tar /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt 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 FROM tar AS azure-vnet @@ -19,7 +17,7 @@ ARG OS ARG ARCH WORKDIR /azure-container-networking COPY . . -COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=tar /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt 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 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS compressor From 7d17435656304ddf7641efe1fbd68573361b157b Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:35:13 -0700 Subject: [PATCH 2/2] remove cert copy --- dropgz/build/cni.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 00e7c53c8e..61ef107155 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -8,7 +8,6 @@ ARG OS ARG ARCH WORKDIR /azure-ipam COPY ./azure-ipam . -COPY --from=tar /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt 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 FROM tar AS azure-vnet @@ -17,7 +16,6 @@ ARG OS ARG ARCH WORKDIR /azure-container-networking COPY . . -COPY --from=tar /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt 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 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS compressor