From be63235aa974a2d6dfb98dba19530ff33469594f Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 4 Aug 2017 10:41:20 -0400 Subject: Origin image build: add oc client The oc client was left out with the move away from playbook2image. However it is needed in the image for the `oc cluster up` use case for installing logging or metrics. This change adds oc via the latest signed and released client RPM, which requires adding the centos-openshift-origin repo to the image. --- images/installer/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'images/installer/Dockerfile') diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile index d03f33a1d..0d977d48f 100644 --- a/images/installer/Dockerfile +++ b/images/installer/Dockerfile @@ -4,13 +4,16 @@ MAINTAINER OpenShift Team USER root +# Add origin repo for including the oc client +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 httpd-tools openssh-clients" \ +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 \ - && EPEL_PKGS="ansible python-passlib python2-boto" \ + && EPEL_PKGS="ansible python2-boto" \ && yum install -y epel-release \ && yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \ - && rpm -q $INSTALL_PKGS $EPEL_PKGS \ + && rpm -V $INSTALL_PKGS $EPEL_PKGS \ && yum clean all LABEL name="openshift/origin-ansible" \ -- cgit v1.2.3