From 4ff55f2b7ef699305cd2ce12f0a68ea05b148d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 3 Nov 2019 19:53:33 +0100 Subject: [PATCH] RPM: fix docker build script --- redhat/docker/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 1e8b1123b..1c7228970 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e DISTRIB="$1" TDE_VERSION="$2" @@ -14,10 +14,10 @@ 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 import - "${IMAGE}" + 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}" echo "Saving image to '${FILE}'" - docker save "${IMAGE}" | pigz >"${FILE}" + docker image save "${IMAGE}" | pigz >"${FILE}" fi