diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-10-07 21:17:55 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-10-07 21:17:55 +0200 |
| commit | 4c78786737534ba658e3b33230b364850e31fbb5 (patch) | |
| tree | 80807b0ca0d51fd286ab5939dcdefb65dc558e5a /redhat/docker/build.sh | |
| parent | e81c987a3b55cab388b89f647b807414648ad6b8 (diff) | |
| download | tde-packaging-4c787867.tar.gz tde-packaging-4c787867.zip | |
RPM: many updates for upcoming R14.1.3
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/build.sh')
| -rwxr-xr-x | redhat/docker/build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index a53ffd06a..da21a69f5 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -7,6 +7,7 @@ ARCH="$3" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" @@ -20,11 +21,11 @@ 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} image save "${IMAGE}" | pigz >"${FILE}" + ${DOCKER} image save "${IMAGE}" | ${GZIP} >"${FILE}" fi # Strip 'localhost/' prefix from image tag -if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then - docker image tag "localhost/${IMAGE}" "${IMAGE}" - #docker image remove "localhost/${IMAGE}" +if ! ${DOCKER} images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then + ${DOCKER} image tag "localhost/${IMAGE}" "${IMAGE}" + #${DOCKER} image remove "localhost/${IMAGE}" fi |