diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-24 08:10:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 08:10:53 -0500 |
| commit | 7e112b2c5893623dcd059813c993b0fab57e58b4 (patch) | |
| tree | fb226772ec0f0273cef60f903ab7f3bd17d06e68 /images/installer/Dockerfile | |
| parent | dd5c2a24872490f34be8516e4f03a4076be35789 (diff) | |
| parent | f2b14d2e76d8a9b19d9515f00c0eac85876363f5 (diff) | |
| download | openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.gz openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.bz2 openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.xz openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.zip | |
Merge pull request #6541 from smarterclayton/move_gcp_in
Allow openshift-ansible image to deploy to GCP
Diffstat (limited to 'images/installer/Dockerfile')
| -rw-r--r-- | images/installer/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile index b1390480a..22a0d06a0 100644 --- a/images/installer/Dockerfile +++ b/images/installer/Dockerfile @@ -8,12 +8,14 @@ USER root 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" \ +RUN INSTALL_PKGS="python-lxml python-dns 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 python2-boto python2-boto3 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 \ + && EPEL_TESTING_PKGS="python2-libcloud" \ + && yum install -y --enablerepo=epel-testing --setopt=tsflags=nodocs $EPEL_TESTING_PKGS \ + && rpm -V $INSTALL_PKGS $EPEL_PKGS $EPEL_TESTING_PKGS \ && yum clean all LABEL name="openshift/origin-ansible" \ |