From f643e469813d952cdb413fa6be47991bf7894f8c Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 17 Apr 2025 12:35:38 -0600 Subject: [PATCH] ceph-dev-new-setup: Use setup_container_runtime.sh Signed-off-by: Zack Cerza --- ceph-dev-new-setup/build/build | 12 ++++++------ .../config/definitions/ceph-dev-new-setup.yml | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build index 04822201..ad568118 100644 --- 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 705425c4..dffa7ca8 100644 --- 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 -- 2.39.5