diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-12-21 03:15:53 -0500 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2017-12-21 11:18:10 -0500 |
| commit | 0d79c5282302517861936ecf608fb99d4390446d (patch) | |
| tree | e548859d08625d058c36267bba1f9b8ecbb5e1c5 | |
| parent | cbcfd8a6d669e5b76afca79d3523bc537df804d3 (diff) | |
| download | openshift-0d79c5282302517861936ecf608fb99d4390446d.tar.gz openshift-0d79c5282302517861936ecf608fb99d4390446d.tar.bz2 openshift-0d79c5282302517861936ecf608fb99d4390446d.tar.xz openshift-0d79c5282302517861936ecf608fb99d4390446d.zip | |
Must directly specify google-cloud-sdk version
The upstream forces versions on packages, and rpm -V fails when it does
not match. Also add which, used by gcloud.
| -rw-r--r-- | images/installer/Dockerfile | 9 | ||||
| -rw-r--r-- | images/installer/origin-extra-root/etc/yum.repos.d/google-cloud-sdk.repo | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile index 9a10ff257..db362bd65 100644 --- a/images/installer/Dockerfile +++ b/images/installer/Dockerfile @@ -10,14 +10,7 @@ COPY images/installer/origin-extra-root / # install ansible and deps RUN INSTALL_PKGS="python-lxml pyOpenSSL python2-cryptography openssl java-1.8.0-openjdk-headless python2-passlib httpd-tools openssh-clients origin-clients" \ && yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS \ - && echo '[google-cloud-sdk]' > /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo 'baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo 'enabled=1' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo 'gpgcheck=1' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo 'repo_gpgcheck=1' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo 'gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && echo ' https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg' >> /etc/yum.repos.d/google-cloud-sdk.repo \ - && EPEL_PKGS="ansible python2-boto google-cloud-cdk" \ + && EPEL_PKGS="ansible python2-boto google-cloud-sdk-183.0.0 which" \ && yum install -y epel-release \ && yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \ && rpm -V $INSTALL_PKGS $EPEL_PKGS \ diff --git a/images/installer/origin-extra-root/etc/yum.repos.d/google-cloud-sdk.repo b/images/installer/origin-extra-root/etc/yum.repos.d/google-cloud-sdk.repo new file mode 100644 index 000000000..7bb8502e9 --- /dev/null +++ b/images/installer/origin-extra-root/etc/yum.repos.d/google-cloud-sdk.repo @@ -0,0 +1,8 @@ +[google-cloud-sdk] +name=google-cloud-sdk +baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64 +enabled=1 +gpgcheck=1 +repo_gpgcheck=1 +gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg + https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg |