summaryrefslogtreecommitdiffstats
path: root/src/script/ceph-debug-docker.sh
diff options
context:
space:
mode:
authorPatrick Donnelly <pdonnell@redhat.com>2018-07-14 02:01:51 +0200
committerPatrick Donnelly <pdonnell@redhat.com>2018-07-14 02:08:26 +0200
commit08bb5a244f819144c12c12b42d0614e220f7dfa4 (patch)
treeb560b5606e39fb83f9789c1f2fc05ee9ec895d6b /src/script/ceph-debug-docker.sh
parentMerge PR #21885 into master (diff)
downloadceph-08bb5a244f819144c12c12b42d0614e220f7dfa4.tar.xz
ceph-08bb5a244f819144c12c12b42d0614e220f7dfa4.zip
ceph-debug-docker: install python3 cephfs/rados packages
Fixes: http://tracker.ceph.com/issues/24870 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Diffstat (limited to 'src/script/ceph-debug-docker.sh')
-rwxr-xr-xsrc/script/ceph-debug-docker.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh
index bac2cee71aa..88e8d79d088 100755
--- a/src/script/ceph-debug-docker.sh
+++ b/src/script/ceph-debug-docker.sh
@@ -92,7 +92,7 @@ COPY cephdev.asc cephdev.asc
RUN apt-key add cephdev.asc && \
curl -L https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/${env/://}/repo | tee /etc/apt/sources.list.d/ceph_dev.list && \
apt-get update --yes && \
- DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get --assume-yes -q --no-install-recommends install -o Dpkg::Options::=--force-confnew --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-common-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg
+ DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get --assume-yes -q --no-install-recommends install -o Dpkg::Options::=--force-confnew --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-common-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg python3-cephfs python3-rados
EOF
time run docker build $CACHE --tag "$tag" .
else # try RHEL flavor
@@ -105,7 +105,7 @@ RUN yum update -y && \
RUN wget -O /etc/yum.repos.d/ceph-dev.repo https://shaman.ceph.com/api/repos/ceph/${branch}/${sha}/centos/7/repo && \
yum clean all && \
yum upgrade -y && \
- yum install -y ceph ceph-debuginfo ceph-fuse
+ yum install -y ceph ceph-debuginfo ceph-fuse python34-rados python34-cephfs
EOF
fi
popd