Browse Source

RPM: update docker scripts

pull/14/head
François Andriot 7 months ago
parent
commit
611c4063a9

+ 1
- 3
redhat/docker/build.sh View File

@@ -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

+ 3
- 1
redhat/docker/oss150/packages View File

@@ -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

+ 3
- 0
redhat/docker/oss423/packages View File

@@ -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

+ 12
- 0
redhat/docker/pull.sh View File

@@ -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}"

+ 13
- 0
redhat/docker/push.sh View File

@@ -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}"

+ 14
- 0
redhat/docker/remove.sh View File

@@ -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}"

+ 3
- 2
redhat/docker/run.sh View File

@@ -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} \

Loading…
Cancel
Save