Browse Source

RPM: update docker scripts

François Andriot 2 months ago
parent
commit
611c4063a9

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

@@ -1,4 +1,4 @@
1
-#!/bin/bash
1
+#!/bin/bash -ex
2 2
 
3 3
 DISTRIB="$1"
4 4
 TDE_VERSION="$2"
@@ -10,8 +10,6 @@ ARCH="$3"
10 10
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
11 11
 FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
12 12
 
13
-#docker rmi -f "${IMAGE}"
14
-
15 13
 if [ $(docker images -q "${IMAGE}") ]; then
16 14
   echo "Docker image '${IMAGE}' already exists."
17 15
 elif [ -r "${FILE}" ]; then

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

@@ -38,6 +38,7 @@ fribidi-devel
38 38
 gamin-devel
39 39
 gcc-c++
40 40
 giflib-devel
41
+git
41 42
 glu-devel
42 43
 gmime-devel
43 44
 gmp-devel
@@ -86,7 +87,7 @@ libidn-devel
86 87
 libiw-devel
87 88
 libjack-devel
88 89
 libjasper-devel
89
-liblcms-devel
90
+liblcms2-devel
90 91
 liblo-devel
91 92
 liblrdf-devel
92 93
 libmad-devel
@@ -176,6 +177,7 @@ update-desktop-files
176 177
 usbutils
177 178
 utempter-devel
178 179
 valgrind
180
+vim
179 181
 wireless-tools
180 182
 wv2-devel
181 183
 xcb-proto-devel

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

@@ -38,6 +38,7 @@ fribidi-devel
38 38
 gamin-devel
39 39
 gcc-c++
40 40
 giflib-devel
41
+git
41 42
 glu-devel
42 43
 gmime-devel
43 44
 gmp-devel
@@ -60,6 +61,7 @@ ImageMagick-devel
60 61
 imlib2-devel
61 62
 intltool
62 63
 java-1_8_0-openjdk-devel
64
+less
63 65
 libacl-devel
64 66
 libart_lgpl-devel
65 67
 libavahi-devel
@@ -174,6 +176,7 @@ update-desktop-files
174 176
 usbutils
175 177
 utempter-devel
176 178
 valgrind
179
+vim
177 180
 wireless-tools
178 181
 wv2-devel
179 182
 xcb-proto-devel

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

@@ -0,0 +1,12 @@
1
+#!/bin/bash -ex
2
+
3
+DISTRIB="$1"
4
+TDE_VERSION="$2"
5
+ARCH="$3"
6
+
7
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
8
+[ -z "${ARCH}" ] && ARCH="x86_64"
9
+
10
+IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
11
+
12
+docker pull "docker:5000/${IMAGE}"

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

@@ -0,0 +1,13 @@
1
+#!/bin/bash -ex
2
+
3
+DISTRIB="$1"
4
+TDE_VERSION="$2"
5
+ARCH="$3"
6
+
7
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
8
+[ -z "${ARCH}" ] && ARCH="x86_64"
9
+
10
+IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
11
+
12
+docker tag "${IMAGE}" "docker:5000/${IMAGE}"
13
+docker push "docker:5000/${IMAGE}"

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

@@ -0,0 +1,14 @@
1
+#!/bin/bash -ex
2
+
3
+DISTRIB="$1"
4
+TDE_VERSION="$2"
5
+ARCH="$3"
6
+
7
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
8
+[ -z "${ARCH}" ] && ARCH="x86_64"
9
+
10
+IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
11
+FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
12
+
13
+docker rmi -f "${IMAGE}"
14
+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}"
14 14
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
15 15
 mkdir -p "/dev/shm/docker"
16 16
 
17
-case "${VERSION}" in
17
+case "${TDE_VERSION}" in
18 18
   "14.0."*) TDE_BRANCH="r14.0.x";;
19 19
   *) TDE_BRANCH="master";;
20 20
 esac
@@ -31,7 +31,8 @@ docker run -ti --rm --privileged \
31 31
   -e TDE_BRANCH=${TDE_BRANCH} \
32 32
   -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \
33 33
   -v ${HOME}/.gnupg:/home/trinity/.gnupg \
34
-  -v ${HOME}/tde/${TDE_BRANCH}/tde-packaging:/home/trinity/tde/${TDE_BRANCH}/tde-packaging \
34
+  -v ${HOME}/tde/master:/home/trinity/tde/master \
35
+  -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \
35 36
   -v ${HOME}/tde/patches:/home/trinity/tde/patches \
36 37
   -v ${HOME}/tde/tarballs:/home/trinity/tde/tarballs \
37 38
   -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \

Loading…
Cancel
Save