diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-04-23 10:31:57 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-04-23 10:32:08 +0200 |
| commit | 439da8db91e9beed6af6c4de6a4a72ac370351e0 (patch) | |
| tree | 23ae9a239a8cc33338481d52bbf00d85a9e70526 | |
| parent | 4a082768066b2b3ac46d6aaa2f6954be6e021d1b (diff) | |
| download | tde-packaging-439da8db91e9beed6af6c4de6a4a72ac370351e0.tar.gz tde-packaging-439da8db91e9beed6af6c4de6a4a72ac370351e0.zip | |
RPM: update build scripts
| -rwxr-xr-x | redhat/docker/build.sh | 11 | ||||
| -rw-r--r-- | redhat/docker/el8/packages | 1 | ||||
| -rw-r--r-- | redhat/docker/f31/packages | 1 | ||||
| -rwxr-xr-x | redhat/docker/run.sh | 7 |
4 files changed, 12 insertions, 8 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 diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 4564537aa..7eafa7d52 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -9,6 +9,7 @@ binutils-devel bison bluez-libs-devel boost-devel +boost-python3-devel bzip2-devel cdparanoia cdparanoia-devel diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages index 02edb6a1d..552cc3df5 100644 --- a/redhat/docker/f31/packages +++ b/redhat/docker/f31/packages @@ -8,6 +8,7 @@ bind-devel binutils-devel bison boost-devel +boost-python3-devel bzip2-devel ccache cdparanoia 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} \ |