mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: allow CONTAINER_CMD prefixed with sudo

Browse Source 
Allow passing:
$ CONTAINER_CMD="sudo docker" ./scripts/minikube.sh cephcsi
or
$ CONTAINER_CMD="sudo podman" ./scripts/minikube.sh cephcsi

Because the container images could list in '# sudo docker images' or
'# sudo podman images' incase if the Makefile target image-cephcsi is
run with sudo

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever 2020-09-03 16:21:19 +05:30 committed by mergify[bot]
parent 6fa7b74138
commit bddf395eba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/minikube.sh
View File

@ -97,13 +97,14 @@ function install_kubectl() {
} }
function validate_container_cmd() { function validate_container_cmd() {
if [[ "${CONTAINER_CMD}" == "docker" ]] || [[ "${CONTAINER_CMD}" == "podman" ]]; then local cmd="${CONTAINER_CMD##* }"
if ! command -v "${CONTAINER_CMD}" &> /dev/null; then if [[ "${cmd}" == "docker" ]] || [[ "${cmd}" == "podman" ]]; then
echo "'${CONTAINER_CMD}' not found" if ! command -v "${cmd}" &> /dev/null; then
echo "'${cmd}' not found"
exit 1 exit 1
fi fi
else else
echo "'CONTAINER_CMD' should be either docker or podman and not '${CONTAINER_CMD}'" echo "'CONTAINER_CMD' should be either docker or podman and not '${cmd}'"
exit 1 exit 1
fi fi
} }