diff options
Diffstat (limited to 'redhat/docker/el6/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.i686 | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index ccca2f0d3..ba9982502 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -3,7 +3,11 @@ FROM centos32:6 ARG TDE_VERSION=14.0.7 ARG ARCH=i686 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" + +# Update distribution packages +RUN setarch ${ARCH} 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 setarch ${ARCH} yum -y update +ADD packages /packages RUN setarch ${ARCH} 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 |