From d3457c72cf0e0e035167aae9e256b31cff82fab9 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 14 Aug 2018 14:17:21 +0100 Subject: [PATCH] script/kubejacker: include cls libs ...so that rbd, rgw etc will work. Signed-off-by: John Spray --- src/script/kubejacker/Dockerfile | 1 + src/script/kubejacker/kubejacker.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/script/kubejacker/Dockerfile b/src/script/kubejacker/Dockerfile index 9a3971c1ef8..e0b337d2062 100644 --- a/src/script/kubejacker/Dockerfile +++ b/src/script/kubejacker/Dockerfile @@ -22,5 +22,6 @@ ADD lib.tar.gz /usr/lib64/ # Assume developer is using default paths (i.e. /usr/local), so # build binaries will be looking for libs there. 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 diff --git a/src/script/kubejacker/kubejacker.sh b/src/script/kubejacker/kubejacker.sh index 13b1ffa5cf4..cf30a80dae9 100644 --- a/src/script/kubejacker/kubejacker.sh +++ b/src/script/kubejacker/kubejacker.sh @@ -59,12 +59,17 @@ find ./ -name "*.pyc" -exec rm -f {} \; tar --exclude=node_modules --exclude=tests --exclude-backups -czf $BUILDPATH/kubejacker/mgr_plugins.tar.gz * popd -ECLIBS="libec_*.so" +ECLIBS="libec_*.so*" pushd lib strip $ECLIBS #TODO: make stripping optional tar czf $BUILDPATH/kubejacker/eclib.tar.gz $ECLIBS popd +CLSLIBS="libcls_*.so*" +pushd lib +strip $CLSLIBS #TODO: make stripping optional +tar czf $BUILDPATH/kubejacker/clslib.tar.gz $CLSLIBS +popd pushd kubejacker docker build -t $REPO/$IMAGE:$TAG . -- 2.39.5