diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-08-04 10:41:20 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-08-04 10:53:00 -0400 |
| commit | be63235aa974a2d6dfb98dba19530ff33469594f (patch) | |
| tree | 97657c49db1614484e8270f9f5829203da84e5a5 /images/installer/Dockerfile | |
| parent | 16a52f21644e3f542e8501a829cd1f2e6b1c4b9f (diff) | |
| download | openshift-be63235aa974a2d6dfb98dba19530ff33469594f.tar.gz openshift-be63235aa974a2d6dfb98dba19530ff33469594f.tar.bz2 openshift-be63235aa974a2d6dfb98dba19530ff33469594f.tar.xz openshift-be63235aa974a2d6dfb98dba19530ff33469594f.zip | |
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.
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" \ |