ceph-dev-new-setup: Use setup_container_runtime.sh

Signed-off-by: Zack Cerza <zack@cerza.org>

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index 04822201804dc2ad8edce9cd2c7e067349300620..ad568118d5c9cb1c56be9b46af3ebed75b1fea33 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -103,13 +103,13 @@ echo current version $cephver
 
 srcdir=`pwd`
 
-PODMAN_MAJOR_VERSION=$(podman version -f json | jq -r '.Client.Version|split(".")[0]')
-if command -v podman && [ "$PODMAN_MAJOR_VERSION" -ge 4 ]; then
-    PODMAN=podman
-    PODMAN_STORAGE_DIR="$HOME/.local/share/containers/storage/"
-    test -d $PODMAN_STORAGE_DIR && sudo chgrp -R $(groups | cut -d' ' -f1) $PODMAN_STORAGE_DIR
+setup_container_runtime
+if command -v podman; then
+  PODMAN=podman
+elif [[ "$(groups)" =~ .*\ docker\ .* ]]; then
+  PODMAN=docker
 else
-    PODMAN="sudo docker"
+  PODMAN="sudo docker"
 fi
 
 if [ -d "$releasedir/$cephver" ]; then

diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
index 705425c45fe53a1d96f478f5742de36cdb127ccf..dffa7ca8bf0d231f90431662963fc2ca3644c3c6 100644 (file)
--- a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
+++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
@@ -36,6 +36,7 @@
     builders:
       - shell:
           !include-raw-verbatim:
+            - ../../../scripts/setup_container_runtime.sh
             - ../../../scripts/build_utils.sh
             - ../../build/build