From effbf509eea4f37a1a8660242769ed1746b67ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 30 Jan 2021 23:53:31 +0100
Subject: RPM: update build scripts for Fedora 33 / CentOS 8

---
 redhat/docker/pclinuxos/Dockerfile.x86_64 | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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

diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 2cd400aba..8b8101939 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,37 +1,40 @@
 FROM pclinuxos:2020
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Update distribution
-RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade
-
 # Install Trinity build dependencies
-ADD packages.${ARCH} /packages
-RUN apt-get -y update && apt-get -y install $(</packages)
+COPY packages.${ARCH} /packages
+RUN apt-get -y update \
+ && apt-get -y install glibc \
+ && apt-get -y dist-upgrade \
+ && apt-get -y install $(</packages)
 
 # Add rpmbuild repositories
-ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
+COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
 RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix SUDO configuration
-#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
+RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
 
 # Fix utempter detection
 RUN chmod a+r /usr/libexec/utempter/utempter
 
 # Fix missing '.la' files
-ADD genla.sh /usr/bin/genla.sh
+COPY genla.sh /usr/bin/genla.sh
 RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
  && genla.sh libjpeg \
  && genla.sh liblcms \
  && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
 
 # Add non-root user to build packages
-RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
-- 
cgit v1.2.3