Skip to content

Commit

Permalink
Merge pull request #4824 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…4819-to-release-4.7

[release-4.7] Bug 1947122: gcp: install google cloud sdk with yum the recommended way
  • Loading branch information
openshift-merge-robot committed Apr 9, 2021
2 parents e15f17c + 40fdb29 commit 04f7c7f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion images/installer/Dockerfile.upi.ci
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 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=0\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 \
Expand Down

0 comments on commit 04f7c7f

Please sign in to comment.