diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-11-08 20:47:18 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-11-19 15:07:31 +0100 |
| commit | 5259ca7ff29406043491aa22851af6b7ce32a748 (patch) | |
| tree | 7d79564eb7d916fd0defb8c7bbfb065e56a58978 /redhat/docker/el6/Dockerfile.x86_64 | |
| parent | 18cafac14a063cb54c8ed6afc64e87b929c957ee (diff) | |
| download | tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.tar.gz tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/docker/el6/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.x86_64 | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 51953f916..17c83998e 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -3,7 +3,11 @@ FROM centos:6 ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" + +# Update distribution packages +RUN yum -y update # Add EPEL repository RUN yum -y install epel-release @@ -12,21 +16,23 @@ RUN yum -y install epel-release RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm # Install Trinity build dependencies -ADD packages.trinity /packages -RUN yum -y update +ADD packages /packages RUN yum -y install $(</packages) -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" - # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d ADD rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Distro-specific patches +RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros @@ -36,7 +42,7 @@ ADD rpmmacros /home/trinity/.rpmmacros RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm -RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm |