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/oss422/Dockerfile        | 23 -----------------------
 redhat/docker/oss422/Dockerfile.x86_64 | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 redhat/docker/oss422/Dockerfile
 create mode 100644 redhat/docker/oss422/Dockerfile.x86_64

(limited to 'redhat/docker/oss422')

diff --git a/redhat/docker/oss422/Dockerfile b/redhat/docker/oss422/Dockerfile
deleted file mode 100644
index ecb34f1ef..000000000
--- a/redhat/docker/oss422/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM opensuse:42.2
-
-ARG TDE_VERSION=14.0.4
-ARG ARCH=x86_64
-
-# Add PACKMAN repository
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_42.2/ packman
-RUN zypper refresh
-
-# Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN zypper install -l -y $(</etc/zypp/packages)
-
-# 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
-
-# Add YUM repository for locally built packages
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
-RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
-RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
new file mode 100644
index 000000000..ecb34f1ef
--- /dev/null
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM opensuse:42.2
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_42.2/ packman
+RUN zypper refresh
+
+# Install Trinity build dependencies
+ADD packages /etc/zypp/packages
+RUN zypper install -l -y $(</etc/zypp/packages)
+
+# 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
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
+RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
-- 
cgit v1.2.1