From fd6fce800bb45e8ccae44b821a2c3ff39ddae4c4 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Sun, 21 Aug 2022 15:41:43 -0500 Subject: [PATCH 1/2] Updates base to v1.4.1 Signed-off-by: Sean Sundberg --- Containerfile-alpine | 2 +- Containerfile-fedora | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile-alpine b/Containerfile-alpine index e295d47..559e222 100644 --- a/Containerfile-alpine +++ b/Containerfile-alpine @@ -1,5 +1,5 @@ ARG TERRAFORM_VERSION=v1.2 -FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.4.0-alpine +FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.4.1-alpine ARG TARGETPLATFORM diff --git a/Containerfile-fedora b/Containerfile-fedora index 7980542..fb3d203 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -1,5 +1,5 @@ ARG TERRAFORM_VERSION=v1.2 -FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.4.0-fedora +FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.4.1-fedora ARG TARGETPLATFORM From 500caa471ddff929811deed80b79931c7f997940 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Sun, 21 Aug 2022 17:30:46 -0500 Subject: [PATCH 2/2] Streamlines azure cli install Signed-off-by: Sean Sundberg --- Containerfile-fedora | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Containerfile-fedora b/Containerfile-fedora index fb3d203..5353318 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -15,11 +15,11 @@ RUN sudo dnf install -y \ && aws --version ## Azure cli -RUN sudo dnf install -y gcc musl-devel python3-devel libffi-devel openssl-devel cargo make python3 python3-pip \ - && sudo pip3 install --upgrade pip \ - && sudo pip3 install azure-cli \ - && sudo dnf clean all \ - && az --version +RUN sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ + sudo dnf install -y https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \ + sudo dnf install -y azure-cli && \ + sudo dnf clean all && \ + az --version # Install the ibmcloud cli RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \