RPM: update docker scripts

57 files changed, 852 insertions, 102 deletions

diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 88adfbe38..1e8b1123b 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686
index 8b6cbf724..39400e044 100644
--- a/redhat/docker/el5/Dockerfile.i686
+++ b/redhat/docker/el5/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:5
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Add local repositories
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index 84a626539..fc184f677 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:5
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add local repositories
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index e8e4dbb8d..ccca2f0d3 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
@@ -16,6 +16,9 @@ ADD packages.trinity /packages
 RUN setarch ${ARCH} yum -y update
 RUN setarch ${ARCH} yum -y install $(</packages)
 
+# 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 YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
 ADD rpmbuild.repo rpmbuild.repo
@@ -24,7 +27,30 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
 # 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
+
+USER trinity
 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|"
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 9b845631f..51953f916 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:6
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
@@ -16,6 +16,9 @@ ADD packages.trinity /packages
 RUN yum -y update
 RUN yum -y install $(</packages)
 
+# 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 YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
 ADD rpmbuild.repo rpmbuild.repo
@@ -24,7 +27,30 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
 # 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
+
+USER trinity
 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|"
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity
index ee5f0ba89..d24bc6636 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages.trinity
@@ -131,13 +131,14 @@ libXcomposite-devel
 libXdamage-devel
 libXdmcp-devel
 libxkbfile-devel
-libXScrnSa
+libXScrnSaver
 libXScrnSaver-devel
 libxslt-devel
 libXtst-devel
 libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
+libyaz-devel
 libzrtpcpp-devel
 lirc-devel
 lm_sensors-devel
@@ -160,9 +161,25 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
+perl(Archive::Zip)
+perl(CPAN)
+perl(CPANPLUS::Backend)
 perl(ExtUtils::MakeMaker)
+perl(ExtUtils::Embed)
+perl(Getopt::ArgvFile)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(JSON)
+perl(Module::ScanDeps)
+perl(Module::Signature)
+perl(prefork)
+perl(Test::CPAN::Meta)
+perl(Test::MinimumVersion)
+perl(Test::More)
+perl(Test::Pod)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
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
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 393dff1b5..57d04e7f0 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -105,6 +105,7 @@ libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
+libpcap-devel
 libqalculate-devel
 libraw1394-devel
 librsvg2-tools
@@ -155,9 +156,11 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
 perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
new file mode 100644
index 000000000..a8667f1eb
--- /dev/null
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -0,0 +1,75 @@
+FROM centos:8
+
+ARG TDE_VERSION=14.0.7
+ARG ARCH=x86_64
+
+RUN echo "proxy=http://proxy:3128" >>/etc/dnf/dnf.conf
+
+# Install OVL plugin for DNF
+RUN curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py
+
+# Add EPEL repository
+RUN dnf -y install epel-release
+
+# Add RPMFUSION repository
+RUN dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm
+
+# Enable supplementary repositories
+RUN dnf -y install dnf-plugins-core
+RUN dnf config-manager --enable PowerTools
+
+# Enable custom repository
+ADD centos-devel.repo /etc/yum.repos.d/centos-devel.repo
+
+# Update distribution packages
+RUN dnf -y update
+
+# Install Trinity build dependencies
+ADD packages /packages
+RUN dnf -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"
+
+# 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
+
+# Build development packages
+USER trinity
+ADD rpmmacros /home/trinity/.rpmmacros
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1.8*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libxml%2b%2b-2.40.1-8.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/g/gnuchess-6.2.5-8.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pilot-link-0.12.5-41.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-*.rpm
+
+#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/liblo-0.29-2.fc30.src.rpm
+#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm
+
+#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/t/t1utils-1.39-9.fc30.src.rpm
+#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/t1utils-1*.rpm
+
+#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/m/mftrace-1.2.19-6.fc30.src.rpm
+#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/mftrace-1*.rpm
+
+#RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/lilypond-2.19.82-4.fc30.src.rpm
+#RUN sed -i ${HOME}/rpmbuild/SPECS/lilypond.spec -e "s|texlive-lh||"
+#RUN rpmbuild -bb ${HOME}/rpmbuild/SPECS/lilypond.spec
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-10.fc30.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
diff --git a/redhat/docker/el8/centos-devel.repo b/redhat/docker/el8/centos-devel.repo
new file mode 100644
index 000000000..9f2fc0051
--- /dev/null
+++ b/redhat/docker/el8/centos-devel.repo
@@ -0,0 +1,12 @@
+[centos-devel]
+name=centos-devel
+baseurl=http://repo/repo/centos-devel/8/$basearch/
+enabled=1
+gpgcheck=0
+
+[centos-devel.noarch]
+name=centos-devel.noarch
+baseurl=http://repo/repo/centos-devel/8/noarch/
+enabled=1
+gpgcheck=0
+
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
new file mode 100644
index 000000000..716acb2fc
--- /dev/null
+++ b/redhat/docker/el8/packages
@@ -0,0 +1,192 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+bluez-libs-devel
+boost-devel
+bzip2-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+doxygen
+emacs
+exempi-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-devel
+fontforge
+fontpackages-devel
+fribidi-devel
+gamin-devel
+gcc
+gcc-c++
+gcc-gfortran
+gettext-devel
+giflib-devel
+glibmm24-devel
+gmp-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+guile-devel
+hspell-devel
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+kernel
+lame-devel
+libacl-devel
+libarchive-devel
+libassuan-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-devel
+libdb-cxx-devel
+libdvdread-devel
+libfontenc-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libksba-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libnsl2-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpcap-devel
+libraw1394-devel
+librsvg2-tools
+librsync-devel
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libudisks2-devel
+libusb-devel
+lirc-devel
+lm_sensors-devel
+mysql-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+opensc
+opensp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl-generators
+perl(ExtUtils::MakeMaker)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(Module::Signature)
+perl(XML::Parser)
+pkcs11-helper-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+pulseaudio-libs-devel
+python2
+python2-devel
+python3
+python3-devel
+readline-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+systemd-devel
+taglib-devel
+texinfo
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xine-lib-devel
+xmlto
+xorg-x11-font-utils
+xz-devel
diff --git a/redhat/docker/el8/rpmbuild.repo b/redhat/docker/el8/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/el8/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
new file mode 100644
index 000000000..c6a7ce03a
--- /dev/null
+++ b/redhat/docker/el8/rpmmacros
@@ -0,0 +1,3 @@
+%dist .el8
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
index c5338a77d..d171bac1b 100644
--- a/redhat/docker/f25/Dockerfile.x86_64
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:25
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
index ea78581fa..199c90224 100644
--- a/redhat/docker/f26/Dockerfile.i686
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:26
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64
index 3899d1220..5b2b15f6b 100644
--- a/redhat/docker/f26/Dockerfile.x86_64
+++ b/redhat/docker/f26/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:26
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686
index 01f6f764f..cd4e731bd 100644
--- a/redhat/docker/f27/Dockerfile.i686
+++ b/redhat/docker/f27/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:27
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64
index e2ecadf4d..63adbe269 100644
--- a/redhat/docker/f27/Dockerfile.x86_64
+++ b/redhat/docker/f27/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:27
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index 1927d264b..0c717477d 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:28
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index 6c26addda..e5875e069 100644
--- a/redhat/docker/f28/Dockerfile.x86_64
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:28
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686
index 914c600f5..20ea16210 100644
--- a/redhat/docker/f29/Dockerfile.i686
+++ b/redhat/docker/f29/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:29
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64
index a4b19cebb..b95e32f0a 100644
--- a/redhat/docker/f29/Dockerfile.x86_64
+++ b/redhat/docker/f29/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:29
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
index 66895fd5c..0f8cac39d 100644
--- a/redhat/docker/f30/Dockerfile.i686
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:30
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
@@ -14,7 +14,6 @@ RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.o
 # Install Trinity build dependencies
 RUN setarch i686 dnf -y --enableplugin=ovl update
 ADD packages /packages
-#RUN cat /packages | xargs -n 10 -P 1 setarch i686 dnf -y --enableplugin=ovl install
 RUN setarch i686 dnf -y --enableplugin=ovl install $(</packages)
 
 # Add YUM repository for locally built packages
diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
index 546697d76..b259f4810 100644
--- a/redhat/docker/f30/Dockerfile.x86_64
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:30
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
@@ -14,7 +14,6 @@ RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedor
 # Install Trinity build dependencies
 RUN dnf -y --enableplugin=ovl update
 ADD packages /packages
-#RUN cat /packages | xargs -n 10 -P 1 dnf -y --enableplugin=ovl install
 RUN dnf -y --enableplugin=ovl install $(</packages)
 
 # Add YUM repository for locally built packages
diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages
index 17cd6fcfe..9d2c5eba2 100644
--- a/redhat/docker/f30/packages
+++ b/redhat/docker/f30/packages
@@ -33,6 +33,7 @@ doxygen
 dssi-devel
 esound-devel
 exempi-devel
+exiv2-devel
 fdupes
 fedora-rpm-macros
 ffmpeg-devel
@@ -171,9 +172,11 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
 perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
diff --git a/redhat/docker/f31/Dockerfile.i686 b/redhat/docker/f31/Dockerfile.i686
new file mode 100644
index 000000000..81d852e50
--- /dev/null
+++ b/redhat/docker/f31/Dockerfile.i686
@@ -0,0 +1,26 @@
+FROM fedora32:31
+
+ARG TDE_VERSION=14.0.7
+ARG ARCH=i686
+
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
+
+# Fix DNF database corruption
+RUN setarch i686 dnf -y install dnf-plugin-ovl findutils
+
+# Add RPMFUSION repository
+RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm
+
+# Install Trinity build dependencies
+RUN setarch i686 dnf -y --enableplugin=ovl update
+ADD packages /packages
+RUN setarch i686 dnf -y --enableplugin=ovl 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"
+
+# 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
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
new file mode 100644
index 000000000..e330e4d9e
--- /dev/null
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -0,0 +1,26 @@
+FROM fedora:31
+
+ARG TDE_VERSION=14.0.7
+ARG ARCH=x86_64
+
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
+
+# Fix DNF database corruption
+RUN dnf -y install dnf-plugin-ovl findutils
+
+# Add RPMFUSION repository
+RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm
+
+# Install Trinity build dependencies
+RUN dnf -y --enableplugin=ovl update
+ADD packages /packages
+RUN dnf -y --enableplugin=ovl 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"
+
+# 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
diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages
new file mode 100644
index 000000000..2451e7e02
--- /dev/null
+++ b/redhat/docker/f31/packages
@@ -0,0 +1,230 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+db4-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gamin-devel
+gcc
+gcc-c++
+gettext-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+icu
+ImageMagick-devel
+imake
+imlib-devel
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl-PAR-Packer
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+sip-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f31/rpmbuild.repo b/redhat/docker/f31/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f31/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f31/rpmmacros b/redhat/docker/f31/rpmmacros
new file mode 100644
index 000000000..d9f3af80c
--- /dev/null
+++ b/redhat/docker/f31/rpmmacros
@@ -0,0 +1,3 @@
+%dist .fc31
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64
index 693b30b4f..a9df3587f 100644
--- a/redhat/docker/mga5/Dockerfile.x86_64
+++ b/redhat/docker/mga5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:5.1
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index 956755001..798cb8c3d 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:6
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
@@ -15,21 +15,32 @@ RUN urpmi.update -a
 RUN urpmi --auto-select --auto
 
 # Install Trinity build dependencies
-ADD packages.${ARCH} /etc/urpmi/packages
-RUN while ! urpmi --auto $(</etc/urpmi/packages); do urpmi.update -a; done
+ADD packages.${ARCH} /packages
+RUN urpmi --auto $(</packages)
 
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix poppler include causing FTBFS
+RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity
 RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index 8a1048fe8..b1e552139 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:6
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
@@ -15,21 +15,32 @@ RUN urpmi.update -a
 RUN urpmi --auto-select --auto
 
 # Install Trinity build dependencies
-ADD packages.${ARCH} /etc/urpmi/packages
-RUN while ! urpmi --auto $(</etc/urpmi/packages); do urpmi.update -a; done
+ADD packages.${ARCH} /packages
+RUN urpmi --auto $(</packages)
 
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix poppler include causing FTBFS
+RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity
 RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 973e8b7b4..dbba1fc69 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -17,6 +17,7 @@ clamav-devel
 cmake
 ctags
 cups-devel
+curl
 curl-devel
 db5-devel
 dbus-devel
@@ -95,9 +96,9 @@ libsane1-devel
 libt1lib-devel
 libtiff-devel
 libtwolame-devel
-libutempter
 libudev-devel
 libusb1.0-devel
+libutempter
 libutempter-devel
 libv4l-devel
 libxaw-devel
@@ -195,6 +196,11 @@ optipng
 pam-devel
 pciutils-devel
 perl-devel
+perl(Archive::Zip)
+perl(Getopt::ArgvFile)
+perl(Module::ScanDeps)
+perl(PAR)
+perl(PAR::Dist)
 perl(XML::Parser)
 pilot-link-devel
 pinentry-gtk2
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 996963cf2..677636f1c 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -17,6 +17,7 @@ clamav-devel
 cmake
 ctags
 cups-devel
+curl
 curl-devel
 db5-devel
 dbus-devel
@@ -97,6 +98,7 @@ lib64tiff-devel
 lib64twolame-devel
 lib64udev-devel
 lib64usb1.0-devel
+lib64utempter
 lib64utempter-devel
 lib64v4l-devel
 lib64xaw-devel
@@ -194,6 +196,11 @@ optipng
 pam-devel
 pciutils-devel
 perl-devel
+perl(Archive::Zip)
+perl(Getopt::ArgvFile)
+perl(Module::ScanDeps)
+perl(PAR)
+perl(PAR::Dist)
 perl(XML::Parser)
 pilot-link-devel
 pinentry-gtk2
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index af381b17e..93da2907b 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:7
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
@@ -18,18 +18,26 @@ RUN urpmi --auto-select --auto
 ADD packages.${ARCH} /packages
 RUN urpmi --auto $(</packages)
 
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity
 RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 2a567685b..b8d29a318 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:7
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
@@ -18,18 +18,26 @@ RUN urpmi --auto-select --auto
 ADD packages.${ARCH} /packages
 RUN urpmi --auto $(</packages)
 
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity
 RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index 471051206..da20adaac 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -23,6 +23,7 @@ dbus-devel
 dbus-glib
 dbus-glib-devel
 djvulibre
+docbook2x
 docbook-dtd412-xml
 docbook-style-xsl
 docbook-utils
@@ -128,7 +129,6 @@ libhd-devel
 libical-devel
 libice-devel
 libifp-devel
-libinotifytools-devel
 libiodbc-devel
 libiw-devel
 libjack-devel
@@ -186,6 +186,7 @@ net-snmp-devel
 NetworkManager-glib-devel
 notification-daemon
 ocaml
+ocaml-facile-devel
 OpenEXR-devel
 openldap-devel
 openldap-servers-devel
@@ -196,7 +197,10 @@ optipng
 pam-devel
 pciutils-devel
 perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
 perl(XML::Parser)
+perl-pcsc-perl
 pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 7954d51b9..ba6b8e05c 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -23,6 +23,7 @@ dbus-devel
 dbus-glib
 dbus-glib-devel
 djvulibre
+docbook2x
 docbook-dtd412-xml
 docbook-style-xsl
 docbook-utils
@@ -73,6 +74,7 @@ lib64cryptsetup-devel
 lib64curl-devel
 lib64dvdread-devel
 lib64ecpg9.6_6
+lib64exiv2-devel
 lib64fbclient-devel
 lib64ffmpeg-devel
 lib64flac-devel
@@ -97,7 +99,7 @@ lib64tiff-devel
 lib64twolame-devel
 lib64udev-devel
 lib64usb1.0-devel
-lib64utempter
+lib64utempter0
 lib64utempter-devel
 lib64v4l-devel
 lib64xaw-devel
@@ -128,7 +130,6 @@ libhd-devel
 libical-devel
 libice-devel
 libifp-devel
-libinotifytools-devel
 libiodbc-devel
 libiw-devel
 libjack-devel
@@ -186,6 +187,7 @@ net-snmp-devel
 NetworkManager-glib-devel
 notification-daemon
 ocaml
+ocaml-facile-devel
 OpenEXR-devel
 openldap-devel
 openldap-servers-devel
@@ -196,7 +198,10 @@ optipng
 pam-devel
 pciutils-devel
 perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
 perl(XML::Parser)
+perl-pcsc-perl
 pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64
index 67928e55a..b98d63d4e 100644
--- a/redhat/docker/oss131/Dockerfile.x86_64
+++ b/redhat/docker/oss131/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.1
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64
index b6a8ef713..74d1a75bd 100644
--- a/redhat/docker/oss132/Dockerfile.x86_64
+++ b/redhat/docker/oss132/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.2
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index 78ad5b63b..d1a385fc2 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.0
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64
index 8af159aac..f0bec552a 100644
--- a/redhat/docker/oss151/Dockerfile.x86_64
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.1
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages
index 0500c5913..629720348 100644
--- a/redhat/docker/oss151/packages
+++ b/redhat/docker/oss151/packages
@@ -154,10 +154,13 @@ patch
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
 pkcs11-helper-devel
 postgresql
 postgresql-devel
 python-devel
+python3-devel
 python-sip-devel
 qt-devel
 rpcgen
diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64
index 94c0742eb..3921f3baf 100644
--- a/redhat/docker/oss421/Dockerfile.x86_64
+++ b/redhat/docker/oss421/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.1
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
index ecb34f1ef..b38871455 100644
--- a/redhat/docker/oss422/Dockerfile.x86_64
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.2
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index ff70474da..c168ea321 100644
--- a/redhat/docker/oss423/Dockerfile.x86_64
+++ b/redhat/docker/oss423/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.3
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 02f84bb8c..f5878bacd 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM opensuse32:tumbleweed
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 156a3a1b8..a30f09e20 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:tumbleweed
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index cf03ada2e..3a374a3b9 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -140,6 +140,8 @@ libXt-devel
 libXtst-devel
 libXv-devel
 libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
 lilo
 lirc-devel
 make
@@ -162,14 +164,17 @@ patch
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
 pkcs11-helper-devel
-postgresql
 postgresql-devel
+postgresql10
+postgresql10-devel
 python-devel
-qt-devel
+python3-devel
 rpcgen
 rpm-build
-rsvg-view
+rsvg-convert
 ruby
 ruby-devel
 sane-backends-devel
@@ -180,6 +185,7 @@ subversion-devel
 sudo
 swig
 sword-devel
+texlive-newunicodechar
 torsocks
 transfig
 unixODBC-devel
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 6ace1d446..d9701cae7 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,10 +1,11 @@
 FROM pclinuxos:2018
 
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 # Update distribution
 RUN apt-get -y update
+RUN apt-get -y install glibc
 RUN apt-get -y dist-upgrade
 
 # Install Trinity build dependencies
@@ -30,3 +31,8 @@ RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64
 RUN genla.sh libjpeg
 RUN genla.sh liblcms
 RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
+
+# Build supplementary development tools
+RUN rpm -i --define "_topdir /tmp" http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|"
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/torsocks-2*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index e6d7358f0..c1472b30b 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -30,7 +30,6 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
-gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -44,27 +43,35 @@ ImageMagick-devel
 imake
 imlib2-devel
 java-devel
+java-sun
 lcms-devel
+lib64clucene-devel
 lib64cryptsetup-devel
+lib64db4.8-devel
 lib64dvdread-devel
 lib64exiv2-devel
+lib64fbclient-devel
 lib64gif-devel
 lib64gpod4
+lib64gpod-devel
 lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
 lib64nm-devel
 lib64mpcdec-devel
 lib64OpenSP5-devel
+lib64pcsclite-devel
 lib64pkcs11-helper-devel
 lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
+lib64sndfile-devel
 lib64usb1.0-devel
 lib64usb-compat0.1-devel
 lib64wv2-devel
 lib64xaw-devel
 lib64xine1.2-devel
+lib64xtst-devel
 lib64yaz-devel
 libcap-devel
 libcdda-devel
@@ -76,7 +83,6 @@ libflac++-devel
 libfontenc-devel
 libgadu-devel
 libgstreamer0.10-devel
-libical-devel
 libice-devel
 libjack-devel
 libjasper-devel
@@ -142,6 +148,8 @@ opensc
 openslp-devel
 pam-devel
 perl-devel
+perl-PAR-Packer
+perl-pcsc-perl
 pilot-link-devel
 postgresql
 postgresql-devel
@@ -149,6 +157,7 @@ pth-devel
 python3
 python-devel
 python-rpm
+qt4-devel
 recode
 rpm-build
 rpm-devel
@@ -162,6 +171,8 @@ subversion-devel
 sudo
 sword-devel
 taglib-devel
+texinfo
+torsocks
 transfig
 udisks2-devel
 unixODBC-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 59b0e9d95..6b1a9016a 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,4 +1,4 @@
-%dist .pclos2018
+%dist .pclos
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2018
+%pclinuxos 2019
diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh
index a8d404ed8..62639c40e 100755
--- a/redhat/docker/pull.sh
+++ b/redhat/docker/pull.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh
index 3c7ca1a7b..3f2da2fcd 100755
--- a/redhat/docker/push.sh
+++ b/redhat/docker/push.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh
index 04f1fcc86..192f34385 100755
--- a/redhat/docker/remove.sh
+++ b/redhat/docker/remove.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index d366c39dc..8e7ee7d56 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"