summaryrefslogtreecommitdiffstats
path: root/redhat/docker/build.sh
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2020-04-23 10:31:57 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2020-04-23 10:32:08 +0200
commit439da8db91e9beed6af6c4de6a4a72ac370351e0 (patch)
tree23ae9a239a8cc33338481d52bbf00d85a9e70526 /redhat/docker/build.sh
parent4a082768066b2b3ac46d6aaa2f6954be6e021d1b (diff)
downloadtde-packaging-439da8db91e9beed6af6c4de6a4a72ac370351e0.tar.gz
tde-packaging-439da8db91e9beed6af6c4de6a4a72ac370351e0.zip
RPM: update build scripts
Diffstat (limited to 'redhat/docker/build.sh')
-rwxr-xr-xredhat/docker/build.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 1c7228970..21f1385e5 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -6,18 +6,19 @@ 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}"
FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
-if [ $(docker images -q "${IMAGE}") ]; then
+if [ $(${DOCKER} images -q "${IMAGE}") ]; then
echo "Docker image '${IMAGE}' already exists."
elif [ -r "${FILE}" ]; then
- echo "Importing existing docker image '${FILE}'."
- zcat "${FILE}" | docker image load
+ echo "Importing existing image '${FILE}'."
+ zcat "${FILE}" | ${DOCKER} image load
else
echo "Building new Docker image '${IMAGE}'."
- docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
+ ${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
echo "Saving image to '${FILE}'"
- docker image save "${IMAGE}" | pigz >"${FILE}"
+ ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}"
fi