From 8d17db2e0995db07518fec7e5fd3a568e9da769c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 4 Sep 2018 21:44:28 +0200
Subject: RPM: update packages for PCLinuxOS 2018

---
 redhat/docker/el6/Dockerfile.i686 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'redhat/docker/el6/Dockerfile.i686')

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
-- 
cgit v1.2.1