From 439da8db91e9beed6af6c4de6a4a72ac370351e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 23 Apr 2020 10:31:57 +0200
Subject: RPM: update build scripts

---
 redhat/docker/run.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'redhat/docker/run.sh')

diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 8e7ee7d56..94a001033 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -6,13 +6,14 @@ ARCH="$3"
 
 [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
+[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
 DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")"
 
 mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
-mkdir -p "/dev/shm/docker"
+mkdir -p "/dev/shm/${DOCKER}"
 
 case "${TDE_VERSION}" in
   "14.0."*) TDE_BRANCH="r14.0.x";;
@@ -21,10 +22,10 @@ esac
 
 mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
 
-docker run -ti --rm --privileged \
+${DOCKER} run -ti --rm --privileged \
   -h "${IMAGE}" \
   --name "${IMAGE//:/-}" \
-  -v /dev/shm/docker:/tmp:z \
+  -v /dev/shm/${DOCKER}:/tmp:z \
   -u trinity \
   -e TMPPATH=/tmp \
   -e TDE_VERSION=${TDE_VERSION} \
-- 
cgit v1.2.1