From 2a9e6e2053407cd126bf1154086f3ca170c7d5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 25 Jul 2017 18:36:32 +0200
Subject: RPM packaging: update build scripts

---
 redhat/docker/el7/Dockerfile        | 27 ---------------------------
 redhat/docker/el7/Dockerfile.x86_64 | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 redhat/docker/el7/Dockerfile
 create mode 100644 redhat/docker/el7/Dockerfile.x86_64

(limited to 'redhat/docker/el7')

diff --git a/redhat/docker/el7/Dockerfile b/redhat/docker/el7/Dockerfile
deleted file mode 100644
index 8e11e1c35..000000000
--- a/redhat/docker/el7/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-ARG TDE_VERSION=14.0.4
-ARG ARCH=x86_64
-
-# Add EPEL repository
-RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-9.noarch.rpm
-
-# 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
-
-# Install Trinity build dependencies
-ADD packages /etc/yum.repos.d/packages
-RUN yum update -y
-RUN yum install -y $(</etc/yum.repos.d/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"
-
-# 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|"
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
new file mode 100644
index 000000000..b52a5a702
--- /dev/null
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -0,0 +1,27 @@
+FROM centos:7
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+# Add EPEL repository
+RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
+
+# 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
+
+# Install Trinity build dependencies
+ADD packages /etc/yum.repos.d/packages
+RUN yum update -y
+RUN yum install -y $(</etc/yum.repos.d/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"
+
+# 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|"
-- 
cgit v1.2.1