From: Sebastian Wagner Date: Mon, 13 May 2019 10:26:14 +0000 (+0200) Subject: scripts/kubejacker: Fix mgr_plugins target for centos X-Git-Tag: v15.1.0~2650^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc340c402a2e91b076f18ea0eb287b53e79fc177;p=ceph.git scripts/kubejacker: Fix mgr_plugins target for centos Also use the latest master as default FROM Signed-off-by: Sebastian Wagner --- diff --git a/src/script/kubejacker/Dockerfile b/src/script/kubejacker/Dockerfile index f392caa030a0..6c8153451e19 100644 --- a/src/script/kubejacker/Dockerfile +++ b/src/script/kubejacker/Dockerfile @@ -1,4 +1,4 @@ -FROM ceph/ceph:latest +FROM ceph/daemon-base:latest-master # for openSUSE, use: # FROM registry.opensuse.org/home/ssebastianwagner/rook-ceph/images/opensuse/leap:latest @@ -11,6 +11,4 @@ FROM ceph/ceph:latest #ADD eclib.tar.gz /usr/local/lib64/ceph/erasure-code/ #ADD clslib.tar.gz /usr/local/lib64/rados-classes/ -ADD mgr_plugins.tar.gz /usr/local/lib64/ceph/mgr -# for openSUSE, use: -# ADD mgr_plugins.tar.gz /usr/share/ceph/mgr +ADD mgr_plugins.tar.gz /usr/share/ceph/mgr