diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-04 11:35:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 11:35:12 -0400 |
| commit | d5a2f2cc00538c7739007c0c6b8a1edc8839601d (patch) | |
| tree | 9036ddf0dac230f179960f7faaafefac01a42032 /images/installer/Dockerfile | |
| parent | c6685cfb5d91c7c7361113aa06506f81dac60375 (diff) | |
| parent | be63235aa974a2d6dfb98dba19530ff33469594f (diff) | |
| download | openshift-d5a2f2cc00538c7739007c0c6b8a1edc8839601d.tar.gz openshift-d5a2f2cc00538c7739007c0c6b8a1edc8839601d.tar.bz2 openshift-d5a2f2cc00538c7739007c0c6b8a1edc8839601d.tar.xz openshift-d5a2f2cc00538c7739007c0c6b8a1edc8839601d.zip | |
Merge pull request #5003 from sosiouxme/20170804-oc-client
Origin image build: add oc client
Diffstat (limited to 'images/installer/Dockerfile')
| -rw-r--r-- | images/installer/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
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 <dev@lists.openshift.redhat.com> 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" \ |