From 655ebdf18d1046473d2ae2c7e3cfc4ced71339f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 1 Jan 2019 22:57:59 +0100 Subject: [PATCH] RPM: update docker scripts --- redhat/docker/build.sh | 4 +--- redhat/docker/oss150/packages | 4 +++- redhat/docker/oss423/packages | 3 +++ redhat/docker/pull.sh | 12 ++++++++++++ redhat/docker/push.sh | 13 +++++++++++++ redhat/docker/remove.sh | 14 ++++++++++++++ redhat/docker/run.sh | 5 +++-- 7 files changed, 49 insertions(+), 6 deletions(-) create mode 100755 redhat/docker/pull.sh create mode 100755 redhat/docker/push.sh create mode 100755 redhat/docker/remove.sh diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index af06b3a6e..88adfbe38 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -ex DISTRIB="$1" TDE_VERSION="$2" @@ -10,8 +10,6 @@ ARCH="$3" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" -#docker rmi -f "${IMAGE}" - if [ $(docker images -q "${IMAGE}") ]; then echo "Docker image '${IMAGE}' already exists." elif [ -r "${FILE}" ]; then diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages index b1b9afe3c..f8bb820e6 100644 --- a/redhat/docker/oss150/packages +++ b/redhat/docker/oss150/packages @@ -38,6 +38,7 @@ fribidi-devel gamin-devel gcc-c++ giflib-devel +git glu-devel gmime-devel gmp-devel @@ -86,7 +87,7 @@ libidn-devel libiw-devel libjack-devel libjasper-devel -liblcms-devel +liblcms2-devel liblo-devel liblrdf-devel libmad-devel @@ -176,6 +177,7 @@ update-desktop-files usbutils utempter-devel valgrind +vim wireless-tools wv2-devel xcb-proto-devel diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages index fe79c5038..e1ae8dff2 100644 --- a/redhat/docker/oss423/packages +++ b/redhat/docker/oss423/packages @@ -38,6 +38,7 @@ fribidi-devel gamin-devel gcc-c++ giflib-devel +git glu-devel gmime-devel gmp-devel @@ -60,6 +61,7 @@ ImageMagick-devel imlib2-devel intltool java-1_8_0-openjdk-devel +less libacl-devel libart_lgpl-devel libavahi-devel @@ -174,6 +176,7 @@ update-desktop-files usbutils utempter-devel valgrind +vim wireless-tools wv2-devel xcb-proto-devel diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh new file mode 100755 index 000000000..a8d404ed8 --- /dev/null +++ b/redhat/docker/pull.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +DISTRIB="$1" +TDE_VERSION="$2" +ARCH="$3" + +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${ARCH}" ] && ARCH="x86_64" + +IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" + +docker pull "docker:5000/${IMAGE}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh new file mode 100755 index 000000000..3c7ca1a7b --- /dev/null +++ b/redhat/docker/push.sh @@ -0,0 +1,13 @@ +#!/bin/bash -ex + +DISTRIB="$1" +TDE_VERSION="$2" +ARCH="$3" + +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${ARCH}" ] && ARCH="x86_64" + +IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" + +docker tag "${IMAGE}" "docker:5000/${IMAGE}" +docker push "docker:5000/${IMAGE}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh new file mode 100755 index 000000000..04f1fcc86 --- /dev/null +++ b/redhat/docker/remove.sh @@ -0,0 +1,14 @@ +#!/bin/bash -ex + +DISTRIB="$1" +TDE_VERSION="$2" +ARCH="$3" + +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${ARCH}" ] && ARCH="x86_64" + +IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" +FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" + +docker rmi -f "${IMAGE}" +rm -f "${FILE}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 639612b4e..d366c39dc 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -14,7 +14,7 @@ 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" -case "${VERSION}" in +case "${TDE_VERSION}" in "14.0."*) TDE_BRANCH="r14.0.x";; *) TDE_BRANCH="master";; esac @@ -31,7 +31,8 @@ docker run -ti --rm --privileged \ -e TDE_BRANCH=${TDE_BRANCH} \ -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \ -v ${HOME}/.gnupg:/home/trinity/.gnupg \ - -v ${HOME}/tde/${TDE_BRANCH}/tde-packaging:/home/trinity/tde/${TDE_BRANCH}/tde-packaging \ + -v ${HOME}/tde/master:/home/trinity/tde/master \ + -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \ -v ${HOME}/tde/patches:/home/trinity/tde/patches \ -v ${HOME}/tde/tarballs:/home/trinity/tde/tarballs \ -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \