Skip to content

Commit

Permalink
Merge pull request #28 from rhcs-dashboard/jsonpatch
Browse files Browse the repository at this point in the history
centos: add jsonpatch rpm (rook failing dep)
  • Loading branch information
alfonsomthd authored Jun 2, 2020
2 parents b61481b + be19af8 commit 52ca0f3
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions docker/ceph/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG CENTOS_VERSION
RUN dnf install -y epel-release \
&& dnf clean packages
RUN dnf install -y bind-utils curl dnf dnf-plugins-core git hostname iputils jq lsof net-tools python3-pip \
util-linux which \
util-linux which python3-jsonpatch \
&& dnf clean packages

RUN dnf config-manager --save --setopt=\*.skip_if_unavailable=true \*
Expand Down Expand Up @@ -43,10 +43,6 @@ RUN dnf install -y libtool-ltdl-devel libxml2-devel python36-devel xmlsec1-devel
# SSO (after installing xmlsec deps).
RUN pip3 install python3-saml==1.9.0

# For dev. mode: py2 is needed to run API tests until teuthology is py3 compatible.
RUN dnf install -y python2-devel \
&& dnf clean packages

COPY nfs-ganesha/nfs-ganesha.repo /etc/yum.repos.d
RUN dnf install -y nfs-ganesha-ceph nfs-ganesha-rados-grace \
&& dnf clean packages
Expand Down

0 comments on commit 52ca0f3

Please sign in to comment.