Skip to content

fix: removing cert container from cniInstaller #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2022
Merged

fix: removing cert container from cniInstaller #1611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2b09e
removing cert container from cniInstaller
camrynl Sep 13, 2022
7d17435
remove cert copy
camrynl Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions dropgz/build/cni.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
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
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
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
Expand All @@ -19,7 +16,6 @@ ARG OS
ARG ARCH
WORKDIR /azure-container-networking
COPY . .
COPY --from=certs /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
Expand Down