diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-11-03 19:53:33 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-11-19 15:07:14 +0100 |
| commit | 4ff55f2b7ef699305cd2ce12f0a68ea05b148d76 (patch) | |
| tree | bf5ad2419fdfed64b8fea7adc9ea9f2ae9def6c2 | |
| parent | 4bfad7f69a49cf7cf5abe9864ddfbe1a79bd54fb (diff) | |
| download | tde-packaging-4ff55f2b7ef699305cd2ce12f0a68ea05b148d76.tar.gz tde-packaging-4ff55f2b7ef699305cd2ce12f0a68ea05b148d76.zip | |
RPM: fix docker build script
| -rwxr-xr-x | redhat/docker/build.sh | 6 |
1 files 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 |