Skip to content

Commit 6064ac4

Browse files
authored
Add jmespath to apb-base (#54)
1 parent 3a30b68 commit 6064ac4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Diff for: Dockerfile-canary

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RUN yum -y install epel-release centos-release-openshift-origin \
2727
python-devel \
2828
python-pip \
2929
python-setuptools \
30+
python2-jmespath \
3031
&& yum clean all
3132

3233
#Workaround for installing python-daemon (pulled in by ansible-runner)
@@ -37,8 +38,7 @@ RUN pip install Jinja2==2.7.2
3738

3839
RUN pip install \
3940
https://github.com/ansible/ansible/archive/devel.tar.gz \
40-
https://github.com/ansible/ansible-runner/archive/master.tar.gz \
41-
jmespath
41+
https://github.com/ansible/ansible-runner/archive/master.tar.gz
4242

4343
RUN git clone https://github.com/openshift/openshift-restclient-python
4444
RUN cd openshift-restclient-python \

Diff for: Dockerfile-latest

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV HOME=${BASE_DIR}
99

1010
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
1111
RUN yum -y install epel-release centos-release-openshift-origin git \
12-
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
12+
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
1313
&& yum clean all
1414

1515
RUN mkdir -p /usr/share/ansible/openshift \

Diff for: Dockerfile-v3.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos:7
1+
FROM centos:7
22
MAINTAINER Ansible Playbook Bundle Community
33
LABEL "com.redhat.apb.runtime"="2"
44

@@ -11,7 +11,7 @@ RUN curl https://copr.fedorainfracloud.org/coprs/g/ansible-service-broker/ansibl
1111
RUN rpm --import https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg \
1212
&& yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.9-1.el7.ans.noarch.rpm \
1313
&& yum -y install epel-release centos-release-openshift-origin git \
14-
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
14+
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
1515
&& yum clean all
1616

1717
RUN mkdir -p /usr/share/ansible/openshift \

Diff for: Dockerfile-v3.11

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV HOME=${BASE_DIR}
1010
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
1111
RUN rpm --import https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg \
1212
&& yum -y install epel-release centos-release-openshift-origin git \
13-
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
13+
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts python2-jmespath \
1414
&& yum clean all
1515

1616
RUN mkdir -p /usr/share/ansible/openshift \

0 commit comments

Comments
 (0)