From 096e163b680861784102352fb1883d967f114433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 3 Nov 2019 11:26:19 +0100
Subject: RPM: update docker scripts

---
 redhat/docker/el7/Dockerfile.x86_64 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'redhat/docker/el7/Dockerfile.x86_64')

diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 23b191982..92e926cd7 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,10 +1,10 @@
 FROM centos:7
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add EPEL repository
-RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm
+RUN yum -y install epel-release
 
 # Add NUX repository
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
@@ -18,10 +18,12 @@ RUN yum install -y $(</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"
 
+# 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
-ADD rpmmacros /home/trinity/.rpmmacros
 
-# 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|"
+USER trinity
+ADD rpmmacros /home/trinity/.rpmmacros
-- 
cgit v1.2.1