summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-21 17:13:14 -0800
committerGitHub <noreply@github.com>2017-12-21 17:13:14 -0800
commit7d2dee36a6b49d335693c0e8554b378f62c7431e (patch)
treed7dff231e4b50ad3d9df53d2d2291b16ec8cfb82 /images
parent2c8ad8c97c2d4ac2778eb2127250e261a1f26113 (diff)
parent0d79c5282302517861936ecf608fb99d4390446d (diff)
downloadopenshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.gz
openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.bz2
openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.tar.xz
openshift-7d2dee36a6b49d335693c0e8554b378f62c7431e.zip
Merge pull request #6542 from smarterclayton/fix_dockerfile
Automatic merge from submit-queue. 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. Fixes break https://ci.openshift.redhat.com/jenkins/job/build-and-release-latest-openshift-ansible-images/210/console
Diffstat (limited to 'images')
-rw-r--r--images/installer/Dockerfile9
-rw-r--r--images/installer/origin-extra-root/etc/yum.repos.d/google-cloud-sdk.repo8
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