diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-05-20 21:02:00 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-05-20 21:02:00 +0200 |
| commit | 3505b711958493545ed72529a15bd2f19a7313cd (patch) | |
| tree | d74b057284d0019b1318c9505e3b050becc75750 /redhat/docker | |
| parent | 5475bd3f14d1ea60a04ed2694989f2c1f9339010 (diff) | |
| download | tde-packaging-3505b711958493545ed72529a15bd2f19a7313cd.tar.gz tde-packaging-3505b711958493545ed72529a15bd2f19a7313cd.zip | |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/docker')
| -rwxr-xr-x | redhat/docker/centos32.sh | 2 | ||||
| -rw-r--r-- | redhat/docker/el5/packages.base | 1 | ||||
| -rw-r--r-- | redhat/docker/el6/packages.base | 1 | ||||
| -rw-r--r-- | redhat/docker/el7/Dockerfile.x86_64 | 6 | ||||
| -rw-r--r-- | redhat/docker/el7/packages | 3 |
5 files changed, 9 insertions, 4 deletions
diff --git a/redhat/docker/centos32.sh b/redhat/docker/centos32.sh index 5dda472b2..afbb25a7f 100755 --- a/redhat/docker/centos32.sh +++ b/redhat/docker/centos32.sh @@ -16,7 +16,7 @@ REPO="centos-${VERSION}" # Installation minimale de la distribution rm -rf "${INSTALLROOT}" install -m 644 "${DIR}/${REPO}.repo" "/etc/yum.repos.d" -yum install --disablerepo="*" --enablerepo="${REPO}*" --nogpgcheck -y --installroot "${INSTALLROOT}" libselinux yum +yum install --disablerepo="*" --enablerepo="${REPO}*" --nogpgcheck --releasever="${VERSION}" -y --installroot "${INSTALLROOT}" libselinux yum yum-plugin-ovl rm -f "/etc/yum.repos.d/${REPO}.repo" touch "${INSTALLROOT}/etc/fstab" "${INSTALLROOT}/etc/mtab" diff --git a/redhat/docker/el5/packages.base b/redhat/docker/el5/packages.base index f4cc26a66..7765aa5df 100644 --- a/redhat/docker/el5/packages.base +++ b/redhat/docker/el5/packages.base @@ -3,3 +3,4 @@ perl setarch vim-enhanced yum +yum-plugin-ovl diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base index f4cc26a66..7765aa5df 100644 --- a/redhat/docker/el6/packages.base +++ b/redhat/docker/el6/packages.base @@ -3,3 +3,4 @@ perl setarch vim-enhanced yum +yum-plugin-ovl diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index b52a5a702..52038a142 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -4,15 +4,15 @@ ARG TDE_VERSION=14.0.4 ARG ARCH=x86_64 # Add EPEL repository -RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm +RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm # Add NUX repository RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm # Install Trinity build dependencies -ADD packages /etc/yum.repos.d/packages +ADD packages /packages RUN yum update -y -RUN yum install -y $(</etc/yum.repos.d/packages) +RUN yum install -y $(</packages) # Add YUM repository for locally built packages ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 10bea3044..57a2f2b44 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -71,6 +71,7 @@ java-devel java-openjdk kernel lame-devel +lcms-devel libacl-devel libarchive-devel libart_lgpl-devel @@ -127,6 +128,7 @@ libXtst-devel libXv-devel libXxf86dga-devel libXxf86vm-devel +libusb-devel lirc-devel lm_sensors-devel meanwhile-devel @@ -194,3 +196,4 @@ xscreensaver-gl-base xscreensaver-gl-extras xulrunner-devel xz-devel +yum-plugin-ovl |