diff options
Diffstat (limited to 'redhat/docker/el6')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.i686 | 17 | ||||
| -rw-r--r-- | redhat/docker/el6/Dockerfile.x86_64 | 17 | ||||
| -rw-r--r-- | redhat/docker/el6/packages.trinity | 2 |
3 files changed, 22 insertions, 14 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index b1e12529f..e8e4dbb8d 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,22 +1,25 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.5 ARG ARCH=i686 +RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf + # Add EPEL repository -RUN yum install -y epel-release +RUN yum -y install epel-release # Add NUX repository 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 /etc/yum.repos.d/packages -RUN setarch ${ARCH} yum update -y -RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || : +ADD packages.trinity /packages +RUN setarch ${ARCH} yum -y update +RUN setarch ${ARCH} yum -y install $(</packages) # Add YUM repository for locally built packages -ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo -RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +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" # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 297141ea1..9b845631f 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,22 +1,25 @@ FROM centos:6 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.5 ARG ARCH=x86_64 +RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf + # Add EPEL repository -RUN yum install -y epel-release +RUN yum -y install epel-release # Add NUX repository 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 /etc/yum.repos.d/packages -RUN yum update -y -RUN yum install -y $(</etc/yum.repos.d/packages) || : +ADD packages.trinity /packages +RUN yum -y update +RUN yum -y install $(</packages) # Add YUM repository for locally built packages -ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo -RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +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" # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity index 6c9e30134..4ee743b2a 100644 --- a/redhat/docker/el6/packages.trinity +++ b/redhat/docker/el6/packages.trinity @@ -50,6 +50,7 @@ gcc-gfortran gcc-java gettext-devel glib-devel +gmime-devel gmp-devel gnokii-devel gperf @@ -190,6 +191,7 @@ taglib-devel tar texinfo texlive-utils +torsocks transfig udisks-devel unixODBC-devel |