diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:53:31 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:53:31 +0100 |
| commit | 24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c (patch) | |
| tree | c9490db2a17d1bcf985c898caf6d10c58c9d81e2 /redhat/docker/el6 | |
| parent | 91820d56fc19f373e2ad40d9d21852eddcb81da7 (diff) | |
| download | tde-packaging-24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c.tar.gz tde-packaging-24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c.zip | |
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/docker/el6')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.i686 | 26 | ||||
| -rw-r--r-- | redhat/docker/el6/Dockerfile.x86_64 | 2 | ||||
| -rw-r--r-- | redhat/docker/el6/packages | 1 |
3 files changed, 13 insertions, 16 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 8844adabc..69e8b11c6 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,26 +1,23 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.0.9 ARG ARCH=i686 # Enable proxy -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" - # Add EPEL repository # Add RPMFUSION repository -RUN rpm -Uvh \ - https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ - https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm - # Install Trinity build dependencies -ADD packages /packages -RUN yum -y clean all \ - && setarch ${ARCH} yum -y update \ - && setarch ${ARCH} yum -y install $(</packages) +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y clean all \ + && setarch i686 yum -y update \ + && setarch i686 yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ + && setarch i686 yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d -ADD rpmbuild.repo rpmbuild.repo +COPY rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" # Fix utempter detection @@ -34,12 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm +RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 3836529c2..36fb8f549 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:6 -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.0.9 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index beeba9fff..13d9d827c 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -49,6 +49,7 @@ gcc gcc-c++ gcc-gfortran gcc-java +geoip-devel gettext-devel glib-devel gmp-devel |