From 5e97e41f92f729ab2b3141f479226f9b3646d458 Mon Sep 17 00:00:00 2001 From: Jeremiah Stuever Date: Wed, 15 Apr 2020 12:36:01 -0700 Subject: [PATCH 1/2] Dockerfile.upi.ci: Combine yum install calls. This change combines the two yum install calls in the Dockerfile.upi.ci image into a single one and moves it to after the yum upgrade call. --- images/installer/Dockerfile.upi.ci | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index ec2605d9843..a784d622780 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -19,15 +19,18 @@ COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc RUN sh -c 'echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" >/etc/yum.repos.d/azure-cli.repo' -RUN yum install --setopt=tsflags=nodocs -y \ - gettext \ - openssh-clients \ - azure-cli \ - openssl && \ - yum update -y && \ +RUN yum update -y && \ yum install --setopt=tsflags=nodocs -y \ - unzip gzip jq util-linux && \ - yum clean all && rm -rf /var/cache/yum/* && \ + azure-cli \ + gettext \ + gzip \ + jq \ + unzip \ + openssh-clients \ + openssl \ + util-linux && \ + yum clean all && \ + rm -rf /var/cache/yum/* && \ chmod g+w /etc/passwd ENV TERRAFORM_VERSION=0.11.11 From ae968dbea68e0a5a22d130ef4d89691d685530c6 Mon Sep 17 00:00:00 2001 From: Jeremiah Stuever Date: Wed, 15 Apr 2020 12:41:01 -0700 Subject: [PATCH 2/2] Dockerfile.upi.ci: Add GCP UPI binaries to the CI Docker file. This change adds the binaries used by CI to install a UPI GCP cluster. --- images/installer/Dockerfile.upi.ci | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index a784d622780..a18f84a42bf 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -19,15 +19,20 @@ COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc RUN sh -c 'echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" >/etc/yum.repos.d/azure-cli.repo' +RUN sh -c 'echo -e "[google-cloud-sdk]\nname=Google Cloud SDK\nbaseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg\n https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg" > /etc/yum.repos.d/google-cloud-sdk.repo' + RUN yum update -y && \ yum install --setopt=tsflags=nodocs -y \ azure-cli \ gettext \ + google-cloud-sdk \ gzip \ jq \ unzip \ openssh-clients \ openssl \ + pyOpenSSL \ + PyYAML \ util-linux && \ yum clean all && \ rm -rf /var/cache/yum/* && \