summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-02-01 16:22:38 -0500
committerGitHub <noreply@github.com>2018-02-01 16:22:38 -0500
commit4fa3f454f7541b98f5123a922f18768deab3df4c (patch)
tree0dfd314be7af27fa18628b525925529375785327 /images
parentf17a431f07370ce42e3d293011e0a7b71cbd95e3 (diff)
parent0bd289e824109ee22c69b2eca6d0e3fc9ce14663 (diff)
downloadopenshift-4fa3f454f7541b98f5123a922f18768deab3df4c.tar.gz
openshift-4fa3f454f7541b98f5123a922f18768deab3df4c.tar.bz2
openshift-4fa3f454f7541b98f5123a922f18768deab3df4c.tar.xz
openshift-4fa3f454f7541b98f5123a922f18768deab3df4c.zip
Merge pull request #6982 from smarterclayton/package
Add python2-crypto package to images
Diffstat (limited to 'images')
-rw-r--r--images/installer/Dockerfile2
-rw-r--r--images/installer/Dockerfile.rhel72
2 files changed, 2 insertions, 2 deletions
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
index 22a0d06a0..c9ec8ba41 100644
--- a/images/installer/Dockerfile
+++ b/images/installer/Dockerfile
@@ -10,7 +10,7 @@ COPY images/installer/origin-extra-root /
# install ansible and deps
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" \
+ && EPEL_PKGS="ansible python2-boto python2-boto3 python2-crypto google-cloud-sdk-183.0.0 which" \
&& yum install -y epel-release \
&& yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \
&& EPEL_TESTING_PKGS="python2-libcloud" \
diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7
index 3b05c1aa6..5da950744 100644
--- a/images/installer/Dockerfile.rhel7
+++ b/images/installer/Dockerfile.rhel7
@@ -5,7 +5,7 @@ MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com>
USER root
# Playbooks, roles, and their dependencies are installed from packages.
-RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto python2-boto3 openssl java-1.8.0-openjdk-headless httpd-tools google-cloud-sdk" \
+RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto python2-boto3 python2-crypto openssl java-1.8.0-openjdk-headless httpd-tools google-cloud-sdk" \
&& yum repolist > /dev/null \
&& yum-config-manager --enable rhel-7-server-ose-3.7-rpms \
&& yum-config-manager --enable rhel-7-server-rh-common-rpms \