Add jmespath to apb-base (#54)

ansibleplaybookbundle · Nov 30, 2018 · 6064ac4 · 6064ac4
1 parent 3a30b68
commit 6064ac4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile-canary b/Dockerfile-canary
@@ -27,6 +27,7 @@ RUN yum -y install epel-release centos-release-openshift-origin \
                       python-devel \
                       python-pip \
                       python-setuptools \
+                      python2-jmespath \
     && yum clean all
 
 #Workaround for installing python-daemon (pulled in by ansible-runner)
@@ -37,8 +38,7 @@ RUN pip install Jinja2==2.7.2
 
 RUN pip install \
     https://github.com/ansible/ansible/archive/devel.tar.gz \
-    https://github.com/ansible/ansible-runner/archive/master.tar.gz \
-    jmespath
+    https://github.com/ansible/ansible-runner/archive/master.tar.gz
 
 RUN git clone https://github.com/openshift/openshift-restclient-python
 RUN cd openshift-restclient-python \

diff --git a/Dockerfile-latest b/Dockerfile-latest
@@ -9,7 +9,7 @@ ENV HOME=${BASE_DIR}
 
 RUN curl https://copr.fedorainfracloud.org/coprs/g/ansible-service-broker/ansible-service-broker-latest/repo/epel-7/group_ansible-service-broker-ansible-service-broker-latest-epel-7.repo -o /etc/yum.repos.d/asb.repo
 RUN yum -y install epel-release centos-release-openshift-origin git \
-    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
+    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
     && yum clean all
 
 RUN mkdir -p /usr/share/ansible/openshift \

diff --git a/Dockerfile-v3.10 b/Dockerfile-v3.10
@@ -1,4 +1,4 @@
-FROM centos:7 
+FROM centos:7
 MAINTAINER Ansible Playbook Bundle Community
 LABEL "com.redhat.apb.runtime"="2"
 
@@ -11,7 +11,7 @@ RUN curl https://copr.fedorainfracloud.org/coprs/g/ansible-service-broker/ansibl
 RUN rpm --import https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg \
  && yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.9-1.el7.ans.noarch.rpm \
  && yum -y install epel-release centos-release-openshift-origin git \
-    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
+    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
     && yum clean all
 
 RUN mkdir -p /usr/share/ansible/openshift \

diff --git a/Dockerfile-v3.11 b/Dockerfile-v3.11
@@ -10,7 +10,7 @@ ENV HOME=${BASE_DIR}
 RUN curl https://copr.fedorainfracloud.org/coprs/g/ansible-service-broker/ansible-service-broker-1.3.0-openshift-3.11/repo/epel-7/group_ansible-service-broker-ansible-service-broker-1.3.0-openshift-3.11-epel-7.repo -o /etc/yum.repos.d/asb.repo
 RUN rpm --import https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg \
  && yum -y install epel-release centos-release-openshift-origin git \
-    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
+    && yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
     && yum clean all
 
 RUN mkdir -p /usr/share/ansible/openshift \