From 7eb29b3cd5f3ee0a7c6c36343c73f386b83ecc2d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Apr 2020 18:05:26 -0400 Subject: [PATCH] cstart.sh: work with docker or podman Signed-off-by: Sage Weil --- src/cstart.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cstart.sh b/src/cstart.sh index 5baf85f8868..1c243b96e69 100755 --- a/src/cstart.sh +++ b/src/cstart.sh @@ -2,6 +2,12 @@ image_base="quay.io/ceph-ci/ceph" +if which podman 2>&1 > /dev/null; then + runtime="podman" +else + runtime="docker" +fi + # fsid if [ -e fsid ] ; then fsid=`cat fsid` @@ -39,7 +45,7 @@ fi echo "port $port" # make sure we have an image -if ! podman image inspect $image_base:$shortid 2>/dev/null; then +if ! $runtime image inspect $image_base:$shortid 2>/dev/null; then echo "building initial $image_base:$shortid image..." sudo ../src/script/cpatch -t $image_base:$shortid fi -- 2.39.5