]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
scripts/kubejacker: Fix mgr_plugins target for centos 28078/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Mon, 13 May 2019 10:26:14 +0000 (12:26 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 13 May 2019 10:26:14 +0000 (12:26 +0200)
Also use the latest master as default FROM

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/script/kubejacker/Dockerfile

index f392caa030a09499be38d915f5e4fdd811349136..6c8153451e1998afed2520e2039ab691ebd6bb70 100644 (file)
@@ -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