From 09f496f8b7823d3ce29be923516966700642625e Mon Sep 17 00:00:00 2001 From: Johnny Liu Date: Wed, 15 Jun 2022 15:27:33 +0800 Subject: [PATCH] install yq in upi installer image --- images/installer/Dockerfile.upi.ci | 1 + images/installer/Dockerfile.upi.ci.rhel8 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index b0d01981062..2aff6f5c511 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -44,6 +44,7 @@ RUN python -m pip install pyopenssl ENV CLOUDSDK_PYTHON=/usr/bin/python RUN python3 -m pip install yq +RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq-3.3.0 ENV TERRAFORM_VERSION=1.0.11 RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \ diff --git a/images/installer/Dockerfile.upi.ci.rhel8 b/images/installer/Dockerfile.upi.ci.rhel8 index 66e6c307b25..e49ee402045 100644 --- a/images/installer/Dockerfile.upi.ci.rhel8 +++ b/images/installer/Dockerfile.upi.ci.rhel8 @@ -38,6 +38,8 @@ RUN yum update -y && \ rm -rf /var/cache/yum/* && \ chmod g+w /etc/passwd +RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq-3.3.0 + # Not packaged for Python 2, but required by gcloud. See https://cloud.google.com/sdk/crypto RUN pip-2 install pyopenssl ENV CLOUDSDK_PYTHON=/usr/bin/python