Skip to content
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

Jump to bottom

Dockerfile.upi.ci: Add GCP UPI required binaries. #3462

Merged
merged 2 commits into from Apr 21, 2020
Merged

Dockerfile.upi.ci: Add GCP UPI required binaries. #3462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6571ce1
Dockerfile.upi.ci: Combine yum install calls.
jstuever Apr 15, 2020
47e5ce5
Dockerfile.upi.ci: Add GCP UPI binaries to the CI Docker file.
jstuever Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 16 additions & 8 deletions images/installer/Dockerfile.upi.ci
View file
Open in desktop
Expand Up @@ -19,15 +19,23 @@ 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 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 \
unzip gzip jq util-linux && \
yum clean all && rm -rf /var/cache/yum/* && \
azure-cli \
gettext \
google-cloud-sdk \
gzip \
jq \
unzip \
openssh-clients \
openssl \
pyOpenSSL \
PyYAML \
util-linux && \
yum clean all && \
rm -rf /var/cache/yum/* && \
chmod g+w /etc/passwd

ENV TERRAFORM_VERSION=0.11.11
Expand Down