From 6064ac48320392ebe93db7a31d49de526bfc2d18 Mon Sep 17 00:00:00 2001 From: David Zager Date: Fri, 30 Nov 2018 08:38:01 -0500 Subject: [PATCH] Add jmespath to apb-base (#54) --- Dockerfile-canary | 4 ++-- Dockerfile-latest | 2 +- Dockerfile-v3.10 | 4 ++-- Dockerfile-v3.11 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile-canary b/Dockerfile-canary index ccf4f59..e338ae5 100644 --- 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 index cf0cb09..2d1f7db 100644 --- 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 index 483eaa6..f679cfe 100644 --- 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 index bae43a5..27847dc 100644 --- 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 \