summaryrefslogtreecommitdiffstats
path: root/redhat/docker
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-01-30 14:34:02 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2021-01-30 22:29:41 +0100
commit6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch)
tree85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/docker
parent87e57a1a070839a44db16a0410ef57902db2df3e (diff)
downloadtde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz
tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip
RPM: massive update and cleanup
Diffstat (limited to 'redhat/docker')
-rwxr-xr-xredhat/docker/build.sh15
-rw-r--r--redhat/docker/el5/Dockerfile.i6862
-rw-r--r--redhat/docker/el5/Dockerfile.x86_642
-rw-r--r--redhat/docker/el5/packages.trinity1
-rw-r--r--redhat/docker/el6/Dockerfile.i68660
-rw-r--r--redhat/docker/el6/Dockerfile.x86_6464
-rw-r--r--redhat/docker/el6/centos-6.repo30
-rw-r--r--redhat/docker/el6/epel-6.repo5
-rw-r--r--redhat/docker/el6/packages (renamed from redhat/docker/el6/packages.trinity)29
-rw-r--r--redhat/docker/el6/packages.base7
-rw-r--r--redhat/docker/el6/repoforge-6.repo5
-rw-r--r--redhat/docker/el7/Dockerfile.x86_6453
-rw-r--r--redhat/docker/el7/packages15
-rw-r--r--redhat/docker/el8/Dockerfile.x86_6497
-rw-r--r--redhat/docker/el8/centos-devel.repo12
-rw-r--r--redhat/docker/el8/packages205
-rw-r--r--redhat/docker/el8/rpmbuild.repo11
-rw-r--r--redhat/docker/el8/rpmmacros3
-rw-r--r--redhat/docker/f25/Dockerfile.x86_642
-rw-r--r--redhat/docker/f25/packages1
-rw-r--r--redhat/docker/f26/Dockerfile.i6862
-rw-r--r--redhat/docker/f26/Dockerfile.x86_642
-rw-r--r--redhat/docker/f26/packages1
-rw-r--r--redhat/docker/f27/Dockerfile.i6862
-rw-r--r--redhat/docker/f27/Dockerfile.x86_642
-rw-r--r--redhat/docker/f27/packages1
-rw-r--r--redhat/docker/f28/Dockerfile.i6862
-rw-r--r--redhat/docker/f28/Dockerfile.x86_642
-rw-r--r--redhat/docker/f28/packages1
-rw-r--r--redhat/docker/f29/Dockerfile.i6862
-rw-r--r--redhat/docker/f29/Dockerfile.x86_642
-rw-r--r--redhat/docker/f29/packages1
-rw-r--r--redhat/docker/f30/Dockerfile.i68629
-rw-r--r--redhat/docker/f30/Dockerfile.x86_6429
-rw-r--r--redhat/docker/f30/packages235
-rw-r--r--redhat/docker/f30/rpmbuild.repo11
-rw-r--r--redhat/docker/f30/rpmmacros3
-rw-r--r--redhat/docker/f31/Dockerfile.x86_6429
-rw-r--r--redhat/docker/f31/packages233
-rw-r--r--redhat/docker/f31/rpmbuild.repo11
-rw-r--r--redhat/docker/f31/rpmmacros3
-rw-r--r--redhat/docker/f32/Dockerfile.x86_6428
-rw-r--r--redhat/docker/f32/packages232
-rw-r--r--redhat/docker/f32/rpmbuild.repo11
-rw-r--r--redhat/docker/f32/rpmmacros3
-rw-r--r--redhat/docker/mga5/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga6/Dockerfile.i68654
-rw-r--r--redhat/docker/mga6/Dockerfile.x86_6454
-rw-r--r--redhat/docker/mga6/packages.i68621
-rw-r--r--redhat/docker/mga6/packages.x86_6420
-rw-r--r--redhat/docker/mga6/rpmmacros1
-rw-r--r--redhat/docker/mga7/Dockerfile.i68644
-rw-r--r--redhat/docker/mga7/Dockerfile.x86_6444
-rw-r--r--redhat/docker/mga7/packages.i686252
-rw-r--r--redhat/docker/mga7/packages.x86_64255
-rw-r--r--redhat/docker/mga7/rpmmacros4
-rwxr-xr-xredhat/docker/opensuse32.sh43
-rw-r--r--redhat/docker/oss131/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss132/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss150/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss151/Dockerfile.x86_6423
-rw-r--r--redhat/docker/oss151/packages198
-rw-r--r--redhat/docker/oss151/rpmmacros3
-rw-r--r--redhat/docker/oss152/Dockerfile.x86_6425
-rw-r--r--redhat/docker/oss152/packages201
-rw-r--r--redhat/docker/oss152/rpmmacros3
-rw-r--r--redhat/docker/oss421/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss422/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss423/Dockerfile.x86_642
-rw-r--r--redhat/docker/osstw/Dockerfile.i68628
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_6428
-rw-r--r--redhat/docker/osstw/packages39
-rw-r--r--redhat/docker/osstw/rpmmacros1
-rw-r--r--redhat/docker/pclinuxos.pkg37
-rwxr-xr-xredhat/docker/pclinuxos.sh6
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_6448
-rw-r--r--redhat/docker/pclinuxos/packages.x86_6423
-rw-r--r--redhat/docker/pclinuxos/rpmmacros4
-rwxr-xr-xredhat/docker/pull.sh2
-rwxr-xr-xredhat/docker/push.sh2
-rwxr-xr-xredhat/docker/remove.sh2
-rwxr-xr-xredhat/docker/run.sh10
82 files changed, 2723 insertions, 262 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 88adfbe38..21f1385e5 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -1,23 +1,24 @@
-#!/bin/bash -ex
+#!/bin/bash -e
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"
+[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
-if [ $(docker images -q "${IMAGE}") ]; then
+if [ $(${DOCKER} images -q "${IMAGE}") ]; then
echo "Docker image '${IMAGE}' already exists."
elif [ -r "${FILE}" ]; then
- echo "Importing existing docker image '${FILE}'."
- zcat "${FILE}" | docker import - "${IMAGE}"
+ echo "Importing existing image '${FILE}'."
+ zcat "${FILE}" | ${DOCKER} image load
else
echo "Building new Docker image '${IMAGE}'."
- docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
+ ${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
echo "Saving image to '${FILE}'"
- docker save "${IMAGE}" | pigz >"${FILE}"
+ ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}"
fi
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/el5/packages.trinity b/redhat/docker/el5/packages.trinity
index da882fb5c..3e21635b2 100644
--- a/redhat/docker/el5/packages.trinity
+++ b/redhat/docker/el5/packages.trinity
@@ -63,7 +63,6 @@ gtk+-devel
gtk-doc
guile-devel
hal-devel
-heimdal-devel
hspell-devel
htdig
html2ps
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index e8e4dbb8d..8844adabc 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,30 +1,64 @@
FROM centos32:6
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=i686
-RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
+# Enable proxy
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
# Add EPEL repository
-RUN yum -y install epel-release
-
-# Add NUX repository
-RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
+# Add RPMFUSION repository
+RUN rpm -Uvh \
+ https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
+ https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
# Install Trinity build dependencies
-ADD packages.trinity /packages
-RUN setarch ${ARCH} yum -y update
-RUN setarch ${ARCH} yum -y install $(</packages)
+ADD packages /packages
+RUN yum -y clean all \
+ && setarch ${ARCH} yum -y update \
+ && setarch ${ARCH} yum -y install $(</packages)
# Add YUM repository for locally built packages
WORKDIR /etc/yum.repos.d
ADD rpmbuild.repo rpmbuild.repo
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+# Fix utempter detection
+# Distro-specific patches
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && 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|" \
+ && ln -sf libmp4v2.so /usr/lib/libmp4.so
+
# 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
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && 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 setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+
+RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
+
+RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm
+
+RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+ && 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 \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN setarch i686 rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
+ && 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..3836529c2 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,30 +1,60 @@
FROM centos:6
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
-RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
-
+# Enable proxy
# Add EPEL repository
-RUN yum -y install epel-release
-
-# Add NUX repository
-RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
-
+# Add RPMFUSION repository
# Install Trinity build dependencies
-ADD packages.trinity /packages
-RUN yum -y update
-RUN yum -y install $(</packages)
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
+ && yum -y update \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && yum -y install $(</packages)
# Add YUM repository for locally built packages
WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+# Fix utempter detection
+# Distro-specific patches
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && 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|" \
+ && ln -sf libmp4v2.so /usr/lib64/libmp4.so
+
# 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
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
-# 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
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+RUN sudo rpm -Uvh http://repo/repo/build-tools/el6/RPMS/x86_64/m4-1.4.16-10.el6.x86_64.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
+ && 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 \
+ && 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 \
+ && 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 \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
diff --git a/redhat/docker/el6/centos-6.repo b/redhat/docker/el6/centos-6.repo
deleted file mode 100644
index a00a85ad5..000000000
--- a/redhat/docker/el6/centos-6.repo
+++ /dev/null
@@ -1,30 +0,0 @@
-[centos-6-base]
-name=CentOS-6 - Base
-baseurl=http://repo/repo/centos/6/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-#released updates
-[centos-6-updates]
-name=CentOS-6 - Updates
-baseurl=http://repo/repo/centos/6/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-#additional packages that may be useful
-[centos-6-extras]
-name=CentOS-6 - Extras
-baseurl=http://repo/repo/centos/6/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-#additional packages that extend functionality of existing packages
-[centos-6-centosplus]
-name=CentOS-6 - Plus
-baseurl=http://repo/repo/centos/6/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
diff --git a/redhat/docker/el6/epel-6.repo b/redhat/docker/el6/epel-6.repo
deleted file mode 100644
index 24134a301..000000000
--- a/redhat/docker/el6/epel-6.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[epel]
-name=epel
-baseurl=http://repo/repo/epel/6/$basearch/
-enabled=1
-gpgcheck=0
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages
index 4ee743b2a..beeba9fff 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages
@@ -29,6 +29,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
+docbook2X
doxygen
e2fsprogs-devel
emacs
@@ -50,12 +51,12 @@ gcc-gfortran
gcc-java
gettext-devel
glib-devel
-gmime-devel
gmp-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
+gpsim-devel
GraphicsMagick-devel
gsl-devel
gstreamer-devel
@@ -65,7 +66,6 @@ gtk+-devel
gtk-doc
guile-devel
hal-devel
-heimdal-devel
hspell-devel
htdig
html2ps
@@ -132,13 +132,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
@@ -161,11 +162,30 @@ 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(Test::Pod::Coverage)
perl(XML::Parser)
+pigz
pilot-link-devel
+pkgconfig(pygtk-2.0)
pkcs11-helper-devel
poppler-devel
postgresql-devel
@@ -179,11 +199,13 @@ ruby-devel
sane-backends-devel
scons
SDL-devel
+selinux-policy-devel
sip-devel
speex-devel
sqlite-devel
subversion-devel
sudo
+swig
sword-devel
t1lib-devel
t1utils
@@ -202,6 +224,7 @@ wireless-tools-devel
xine-lib-devel
xmlto
xorg-x11-font-utils
+xorg-x11-server-utils
xscreensaver
xscreensaver-extras
xulrunner-devel
diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base
deleted file mode 100644
index 21345a31b..000000000
--- a/redhat/docker/el6/packages.base
+++ /dev/null
@@ -1,7 +0,0 @@
-bash
-perl
-setarch
-tar
-vim-enhanced
-yum
-yum-plugin-ovl
diff --git a/redhat/docker/el6/repoforge-6.repo b/redhat/docker/el6/repoforge-6.repo
deleted file mode 100644
index 8747bf2df..000000000
--- a/redhat/docker/el6/repoforge-6.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[dag]
-name=dag
-baseurl=http://repo/repo/repoforge/redhat/el6/en/$basearch/dag/
-enabled=1
-gpgcheck=0
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 23b191982..5d1a2e4cd 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,27 +1,48 @@
FROM centos:7
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
+# Enable proxy
# Add EPEL repository
-RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.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
-
+# Add RPMFUSION repository
# Install Trinity build dependencies
-ADD packages /packages
-RUN yum update -y
-RUN yum install -y $(</packages)
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \
+ && yum -y clean all \
+ && yum -y update \
+ && yum -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"
+WORKDIR /etc/yum.repos.d
+COPY rpmbuild.repo rpmbuild.repo
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+# Distro-specific patches
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && 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|" \
+ && ln -sf libmp4v2.so /usr/lib64/libmp4.so
# 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
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
-# 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
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 60229d64f..7368877e2 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -7,6 +7,7 @@ avahi-devel
bind-devel
binutils-devel
bison
+bluez-libs-devel
boost-devel
bzip2-devel
ccache
@@ -27,6 +28,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
+docbook2X
doxygen
emacs
esound-devel
@@ -61,7 +63,7 @@ gtk2-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
+hiredis-devel
hspell-devel
html2ps
icu
@@ -97,6 +99,7 @@ libical-devel
libidn-devel
libksba-devel
libmad-devel
+libmemcached-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
@@ -106,6 +109,7 @@ libofx-devel
libogg-devel
libotr-devel
libpaper-devel
+libpcap-devel
libqalculate-devel
libraw1394-devel
librsvg2-tools
@@ -138,6 +142,7 @@ libXxf86vm-devel
libusb-devel
lirc-devel
lm_sensors-devel
+logrotate
meanwhile-devel
mysql-devel
neon-devel
@@ -156,14 +161,20 @@ pam-devel
pciutils-devel
pcre-devel
pcsc-lite-devel
+pcsc-perl
perl
perl-devel
+perl-generators
perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
perl(XML::Parser)
+pigz
pilot-link-devel
pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
poppler-devel
postgresql-devel
+ppp
pth-devel
pulseaudio-libs-devel
qt-devel
@@ -176,6 +187,7 @@ ruby-devel
sane-backends-devel
scons
SDL-devel
+selinux-policy-devel
sip-devel
speex-devel
sqlite-devel
@@ -188,6 +200,7 @@ t1lib-devel
t1utils
taglib-devel
tar
+tcl
texinfo
torsocks
transfig
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
new file mode 100644
index 000000000..43f6b7191
--- /dev/null
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -0,0 +1,97 @@
+FROM centos:8
+
+ARG TDE_VERSION=14.0.8
+ARG ARCH=x86_64
+
+# Enable custom repository
+COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo
+
+# Enable proxy
+# Install OVL plugin for DNF
+# Update distribution packages
+# Add EPEL repository
+# Add RPMFUSION repository
+# Enable supplementary repositories
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+ && dnf -y update \
+ && dnf -y install epel-release \
+ && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \
+ && dnf -y install dnf-plugins-core \
+ && dnf config-manager --enable PowerTools \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+WORKDIR /etc/yum.repos.d
+COPY rpmbuild.repo rpmbuild.repo
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+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 \
+ && 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 \
+ && 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 \
+ && 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/p/pylibacl-0.5.2-11.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps
+
+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 \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-1*.rpm --nodeps
+
+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 \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
+
+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 \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/psutils-1.23-15.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-1*.rpm
+
+#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/j/jasper-2.0.14-8.fc30.src.rpm
+#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/jasper-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/w/wireless-tools-29-22.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
+
+RUN rpmbuild --rebuild https://li.nux.ro/download/nux/dextop/el7/SRPMS/libgssglue-0.4-2.el7.nux.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libgssglue{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libao-1.2.0-14.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libao{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Dist-0.49-17.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-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..a9018237e
--- /dev/null
+++ b/redhat/docker/el8/packages
@@ -0,0 +1,205 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+bluez-libs-devel
+boost-devel
+boost-python3-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
+docbook2X
+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
+libmemcached-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
+libxml++-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(Test::Pod)
+perl(Test::Pod::Coverage)
+perl(XML::Parser)
+pigz
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python2
+python2-devel
+python3
+python3-devel
+readline-devel
+recode
+redhat-rpm-config
+redis
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+systemd-devel
+taglib-devel
+tcl
+texinfo
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+wget
+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/f25/packages b/redhat/docker/f25/packages
index e7a74d19f..7578b0a9c 100644
--- a/redhat/docker/f25/packages
+++ b/redhat/docker/f25/packages
@@ -62,7 +62,6 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
hspell-devel
htdig
html2ps
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/f26/packages b/redhat/docker/f26/packages
index 28da2c8db..fd881d1fb 100644
--- a/redhat/docker/f26/packages
+++ b/redhat/docker/f26/packages
@@ -62,7 +62,6 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
hspell-devel
htdig
html2ps
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/f27/packages b/redhat/docker/f27/packages
index 658696a81..4ed40b178 100644
--- a/redhat/docker/f27/packages
+++ b/redhat/docker/f27/packages
@@ -62,7 +62,6 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
hspell-devel
htdig
html2ps
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/f28/packages b/redhat/docker/f28/packages
index 6ada73c34..39096bfee 100644
--- a/redhat/docker/f28/packages
+++ b/redhat/docker/f28/packages
@@ -63,7 +63,6 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
hspell-devel
htdig
html2ps
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/f29/packages b/redhat/docker/f29/packages
index ddaabadc8..d15aab174 100644
--- a/redhat/docker/f29/packages
+++ b/redhat/docker/f29/packages
@@ -63,7 +63,6 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
-heimdal-devel
hspell-devel
htdig
html2ps
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
new file mode 100644
index 000000000..9be8fdbfc
--- /dev/null
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -0,0 +1,29 @@
+FROM fedora32:30
+
+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"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# 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/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
new file mode 100644
index 000000000..31b7fb112
--- /dev/null
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -0,0 +1,29 @@
+FROM fedora:30
+
+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-30.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"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# 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/f30/packages b/redhat/docker/f30/packages
new file mode 100644
index 000000000..8b9d76b4c
--- /dev/null
+++ b/redhat/docker/f30/packages
@@ -0,0 +1,235 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+ccrtp-devel
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+commoncpp2-devel
+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
+pkgconfig(pygtk-2.0)
+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
+selinux-policy-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
+yum-plugin-ovl
diff --git a/redhat/docker/f30/rpmbuild.repo b/redhat/docker/f30/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f30/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/f30/rpmmacros b/redhat/docker/f30/rpmmacros
new file mode 100644
index 000000000..55a9b7b5a
--- /dev/null
+++ b/redhat/docker/f30/rpmmacros
@@ -0,0 +1,3 @@
+%dist .fc30
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
new file mode 100644
index 000000000..4efdd8769
--- /dev/null
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -0,0 +1,29 @@
+FROM fedora:31
+
+ARG TDE_VERSION=14.0.8
+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"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# 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..552cc3df5
--- /dev/null
+++ b/redhat/docker/f31/packages
@@ -0,0 +1,233 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-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
+pkgconfig(pygtk-2.0)
+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
+selinux-policy-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/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
new file mode 100644
index 000000000..38326e028
--- /dev/null
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -0,0 +1,28 @@
+FROM fedora:32
+
+ARG TDE_VERSION=14.0.8
+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-32.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"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+COPY rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages
new file mode 100644
index 000000000..67b320151
--- /dev/null
+++ b/redhat/docker/f32/packages
@@ -0,0 +1,232 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-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
+giflib-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
+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
+pkgconfig(pygtk-2.0)
+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
+selinux-policy-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/f32/rpmbuild.repo b/redhat/docker/f32/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f32/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/f32/rpmmacros b/redhat/docker/f32/rpmmacros
new file mode 100644
index 000000000..fe41a3f29
--- /dev/null
+++ b/redhat/docker/f32/rpmmacros
@@ -0,0 +1,3 @@
+%dist .fc32
+%_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..3b98ac460 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,35 +1,47 @@
FROM mageia32:6
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=i686
# Reset URPMI repositories to default
-RUN urpmi.removemedia -a
-RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'
-
# Enable more URPMI repositories
-RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
# Update distribution
-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.update -a \
+ && urpmi --auto-select --auto \
+ && 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|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
# 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
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
ADD rpmmacros /home/trinity/.rpmmacros
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} 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 \
+ && 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..d8d826d48 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,35 +1,47 @@
FROM mageia:6
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
# Reset URPMI repositories to default
-RUN urpmi.removemedia -a
-RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'
-
# Enable more URPMI repositories
-RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
# Update distribution
-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.update -a \
+ && urpmi --auto-select --auto \
+ && 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|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
# 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
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
ADD rpmmacros /home/trinity/.rpmmacros
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && 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 \
+ && 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..24079d712 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -17,12 +17,14 @@ clamav-devel
cmake
ctags
cups-devel
+curl
curl-devel
db5-devel
dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
@@ -54,6 +56,7 @@ gtk+3.0-devel
gtk-doc
hspell-devel
hunspell-en
+iceauth
ImageMagick-devel
imake
imlib2-devel
@@ -84,9 +87,9 @@ libgstreamer-plugins-base1.0-devel
libinotifytools-devel
libjasper-devel
libjpeg-devel
-libmp3lame-devel
liblua-devel
libmad-devel
+libmp3lame-devel
libpaper-devel
libpkcs11-helper-devel
libpoppler-devel
@@ -95,9 +98,9 @@ libsane1-devel
libt1lib-devel
libtiff-devel
libtwolame-devel
-libutempter
libudev-devel
libusb1.0-devel
+libutempter0
libutempter-devel
libv4l-devel
libxaw-devel
@@ -119,13 +122,13 @@ libdvdread-devel
libffmpeg-devel
libflac-devel
libflac++-devel
-libidn-devel
libgadu-devel
libgpod-devel
libgsf-devel
libhd-devel
libical-devel
libice-devel
+libidn-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
@@ -155,6 +158,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
+libutempter
libvisual-devel
libvorbis-devel
libwmf-devel
@@ -191,18 +195,26 @@ openldap-servers-devel
opensc
openslp-devel
opensp-devel
+openssh-clients
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
pkgconfig(audiofile)
pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
polkit-agent-none
postgresql9.4
postgresql9.4-devel
+ppp
pth-devel
python-devel
python-sip
@@ -217,8 +229,9 @@ SDL-devel
speex-devel
sqlite3-devel
sqlite-devel
-sudo
+sshfs-fuse
subversion-devel
+sudo
sword-devel
taglib-devel
torsocks
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 996963cf2..edf18316c 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -17,12 +17,14 @@ clamav-devel
cmake
ctags
cups-devel
+curl
curl-devel
db5-devel
dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
@@ -54,6 +56,7 @@ gtk+3.0-devel
gtk-doc
hspell-devel
hunspell-en
+iceauth
ImageMagick-devel
imake
imlib2-devel
@@ -84,9 +87,9 @@ lib64gstreamer-plugins-base1.0-devel
lib64inotifytools-devel
lib64jasper-devel
lib64jpeg-devel
-lib64mp3lame-devel
lib64lua-devel
lib64mad-devel
+lib64mp3lame-devel
lib64paper-devel
lib64pkcs11-helper-devel
lib64poppler-devel
@@ -97,6 +100,7 @@ lib64tiff-devel
lib64twolame-devel
lib64udev-devel
lib64usb1.0-devel
+lib64utempter0
lib64utempter-devel
lib64v4l-devel
lib64xaw-devel
@@ -118,13 +122,13 @@ libdvdread-devel
libffmpeg-devel
libflac-devel
libflac++-devel
-libidn-devel
libgadu-devel
libgpod-devel
libgsf-devel
libhd-devel
libical-devel
libice-devel
+libidn-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
@@ -154,6 +158,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
+libutempter
libvisual-devel
libvorbis-devel
libwmf-devel
@@ -190,18 +195,26 @@ openldap-servers-devel
opensc
openslp-devel
opensp-devel
+openssh-clients
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
pkgconfig(audiofile)
pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
polkit-agent-none
postgresql9.4
postgresql9.4-devel
+ppp
pth-devel
python-devel
python-sip
@@ -216,8 +229,9 @@ SDL-devel
speex-devel
sqlite3-devel
sqlite-devel
-sudo
+sshfs-fuse
subversion-devel
+sudo
sword-devel
taglib-devel
torsocks
diff --git a/redhat/docker/mga6/rpmmacros b/redhat/docker/mga6/rpmmacros
index 87fb3a9b9..427abf5c4 100644
--- a/redhat/docker/mga6/rpmmacros
+++ b/redhat/docker/mga6/rpmmacros
@@ -1,3 +1,4 @@
%dist .mga6
%_smp_mflags -j8
%jobs 8
+%_program_prefix ""
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
new file mode 100644
index 000000000..991ee2320
--- /dev/null
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -0,0 +1,44 @@
+FROM mageia32:7
+
+ARG TDE_VERSION=14.0.8
+ARG ARCH=i686
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
+
+# Update distribution
+# Install Trinity build dependencies
+ADD packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# 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"
+
+# Configure user trinity
+USER trinity
+ADD rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} 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 \
+ && 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
new file mode 100644
index 000000000..026549071
--- /dev/null
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -0,0 +1,44 @@
+FROM mageia:7
+
+ARG TDE_VERSION=14.0.8
+ARG ARCH=x86_64
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
+
+# Update distribution
+# Install Trinity build dependencies
+ADD packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# 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"
+
+# Configure user trinity
+USER trinity
+ADD rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} 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 \
+ && 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
new file mode 100644
index 000000000..cc695fb73
--- /dev/null
+++ b/redhat/docker/mga7/packages.i686
@@ -0,0 +1,252 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+karma-sharp
+kde-dev-scripts
+libapr-devel
+libapr-util-devel
+libart_lgpl-devel
+libattr-devel
+libavformat58
+libbinutils-devel
+libblkid-devel
+libcdda-devel
+libcln-devel
+libclucene-devel
+libclucene-devel
+libcommoncpp-devel
+libcommoncpp-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libcurl-devel
+libdvdread-devel
+libdvdread-devel
+libecpg9.6_6
+libexiv2-devel
+libfbclient-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libflac-devel
+libfontenc-devel
+libgadu-devel
+libgeoip-devel
+libgmime2.6-devel
+libgpod-devel
+libgsf-devel
+libgstreamer1.0-devel
+libgstreamer-plugins-base1.0-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjasper-devel
+libjpeg-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+liblua-devel
+libmad-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libnpth-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpaper-devel
+libpkcs11-helper-devel
+libpoppler-devel
+libpulseaudio-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsane1-devel
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libt1lib-devel
+libtheora-devel
+libtiff-devel
+libtwolame-devel
+libudev-devel
+libungif-devel
+libusb1.0-devel
+libutempter
+libutempter0
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxaw-devel
+libxcursor-devel
+libxdg-basedir-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxi-devel
+libxine1.2-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxscrnsaver-devel
+libxslt-devel
+libxtst-devel
+libxv-devel
+libxxf86dga-devel
+libxxf86dga-devel
+libyaz-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+NetworkManager-glib-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
+polkit-agent-none
+postgresql9.6
+postgresql9.6-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
new file mode 100644
index 000000000..9c8f92ea0
--- /dev/null
+++ b/redhat/docker/mga7/packages.x86_64
@@ -0,0 +1,255 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+karma-sharp
+kde-dev-scripts
+lib64apr-devel
+lib64apr-util-devel
+lib64avformat58
+lib64binutils-devel
+lib64boost_python3-devel
+lib64cln-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64ecpg9.6_6
+lib64exiv2-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64geoip-devel
+lib64gmime2.6-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lua-devel
+lib64mad-devel
+lib64mp3lame-devel
+lib64npth-devel
+lib64paper-devel
+lib64pkcs11-helper-devel
+lib64poppler-devel
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64tiff-devel
+lib64twolame-devel
+lib64udev-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libart_lgpl-devel
+libattr-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libconfig-devel
+libcurl-devel
+libdvdread-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libungif-devel
+libutempter
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxslt-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+NetworkManager-glib-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
+polkit-agent-none
+postgresql9.6
+postgresql9.6-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga7/rpmmacros b/redhat/docker/mga7/rpmmacros
new file mode 100644
index 000000000..8d3b31456
--- /dev/null
+++ b/redhat/docker/mga7/rpmmacros
@@ -0,0 +1,4 @@
+%dist .mga7
+%_smp_mflags -j8
+%jobs 8
+%_program_prefix ""
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index a3b888c75..f2d686df5 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -1,19 +1,21 @@
-#!/bin/bash
+#!/bin/bash -e
-NAME="opensuse32"
VERSION="$1" # E.g: '42.3'
-IMAGE="${NAME}:${VERSION}"
-INSTALLROOT="/dev/shm/${IMAGE}"
-
-sudo rm -rf "${INSTALLROOT}"
-sudo mkdir -p "${INSTALLROOT}"
if [ "${VERSION}" = "tumbleweed" ]; then
URL="http://download.opensuse.org/tumbleweed"
+ NAME="opensuse32/tumbleweed"
else
URL="http://download.opensuse.org/distribution/leap/${VERSION}"
+ NAME="opensuse32/leap"
fi
+IMAGE="${NAME}:latest"
+INSTALLROOT="/dev/shm/${IMAGE}"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo mkdir -p "${INSTALLROOT}"
+
sudo zypper --root "${INSTALLROOT}" \
ar "${URL}/repo/oss/" "oss"
sudo zypper --root "${INSTALLROOT}" \
@@ -25,13 +27,30 @@ if [ "${VERSION}" != "tumbleweed" ]; then
sudo zypper --root "${INSTALLROOT}" \
ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss"
fi
-setarch i686 sudo zypper --root "${INSTALLROOT}" \
+sudo zypper --root "${INSTALLROOT}" \
--gpg-auto-import-keys ref
-setarch i686 sudo zypper --root "${INSTALLROOT}" \
- install -y bash vim zypper openSUSE-release
+sudo setarch i686 zypper --root "${INSTALLROOT}" \
+ install --download-only -y \
+ bash \
+ filesystem \
+ glibc \
+ glibc-extra \
+ libpcre1 \
+ libselinux1 \
+ openSUSE-release \
+ system-user-root \
+ util-linux vim \
+ zypper
+sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
+
+sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+FILE="${IMAGE//\//_}.tar"
+sudo tar -C "${INSTALLROOT}" -c . >"${FILE}"
sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
-docker import "${IMAGE}.tar" "${IMAGE}"
+docker import "${FILE}" "${IMAGE}"
+
+pigz "${FILE}"
+mv -fv "${FILE}.gz" "${HOME}/tde/docker"
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
new file mode 100644
index 000000000..3879c1d8e
--- /dev/null
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM opensuse/leap:15.1
+
+ARG TDE_VERSION=14.0.8
+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_15.1/ packman
+RUN zypper refresh
+
+# Install Trinity build dependencies
+ADD packages /packages
+RUN zypper install -l -y $(</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/oss151/packages b/redhat/docker/oss151/packages
new file mode 100644
index 000000000..0af27eadc
--- /dev/null
+++ b/redhat/docker/oss151/packages
@@ -0,0 +1,198 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+cln-devel
+clucene-core-devel
+cmake
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gnokii-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+ImageMagick-devel
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python3-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libgadu-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpisock-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libsmbclient-devel
+libsndfile-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libyaz-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+postgresql
+postgresql-devel
+python-devel
+python3-devel
+python-sip-devel
+qt-devel
+rpcgen
+rpm-build
+rsvg-view
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss151/rpmmacros b/redhat/docker/oss151/rpmmacros
new file mode 100644
index 000000000..d7dfb7aeb
--- /dev/null
+++ b/redhat/docker/oss151/rpmmacros
@@ -0,0 +1,3 @@
+%dist .oss151
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
new file mode 100644
index 000000000..88f2c3224
--- /dev/null
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -0,0 +1,25 @@
+FROM opensuse/leap:15.2
+
+ARG TDE_VERSION=14.0.8
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.2/ packman \
+ && zypper refresh \
+ && zypper update -y \
+ && zypper install -l -y $(</packages)
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch \
+ && zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
new file mode 100644
index 000000000..e3359a007
--- /dev/null
+++ b/redhat/docker/oss152/packages
@@ -0,0 +1,201 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+cln-devel
+clucene-core-devel
+cmake
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python3-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libgadu-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpisock-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libsmbclient-devel
+libsndfile-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+postgresql10
+postgresql10-devel
+python-devel
+python3-devel
+python-sip-devel
+qt-devel
+recode
+rpcgen
+rpm-build
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss152/rpmmacros b/redhat/docker/oss152/rpmmacros
new file mode 100644
index 000000000..a8ecf175a
--- /dev/null
+++ b/redhat/docker/oss152/rpmmacros
@@ -0,0 +1,3 @@
+%dist .oss152
+%_smp_mflags -j8
+%jobs 8
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..7df793232 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,25 +1,25 @@
-FROM opensuse32:tumbleweed
+FROM opensuse32/tumbleweed:latest
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=i686
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
-RUN setarch ${ARCH} zypper refresh
-RUN setarch ${ARCH} zypper --non-interactive dup
-RUN setarch ${ARCH} zypper --non-interactive update
-
-# Install Trinity build dependencies
ADD packages /packages
-RUN setarch ${ARCH} zypper install -l -y $(</packages)
+RUN setarch ${ARCH} zypper refresh \
+ && setarch ${ARCH} zypper -n dup \
+ && setarch ${ARCH} zypper -n update \
+ && setarch ${ARCH} zypper -n install $(</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
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
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
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 156a3a1b8..248b38f76 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,25 +1,25 @@
-FROM opensuse:tumbleweed
+FROM opensuse/tumbleweed:latest
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
-RUN zypper refresh
-RUN zypper --non-interactive dup
-RUN zypper --non-interactive update
-
-# Install Trinity build dependencies
ADD packages /packages
-RUN zypper install -l -y $(</packages)
+RUN zypper refresh \
+ && zypper -n dup \
+ && zypper -n update \
+ && zypper -n install $(</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
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
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
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index cf03ada2e..9d2f2cdbd 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -7,6 +7,7 @@ bdftopcf
bind-devel
binutils-devel
bison
+bluez-devel
boost-devel
ccache
cdparanoia
@@ -17,8 +18,9 @@ clamav
cln-devel
clucene-core-devel
cmake
-createrepo
+createrepo_c
cups-devel
+curl
cyrus-sasl-devel
dbus-1-devel
dbus-1-glib-devel
@@ -26,14 +28,17 @@ djvulibre
docbook-utils
docbook-xsl-stylesheets
doxygen GraphicsMagick
+docbook2x
dssi-devel
fdupes
-ffmpeg-devel
+ffmpeg-4-libavcodec-devel
+ffmpeg-4-libavdevice-devel
fftw3-devel
file-devel
flac-devel
flex
font-util
+freeglut-devel
freetype-devel
fribidi-devel
gamin-devel
@@ -42,7 +47,6 @@ giflib-devel
glu-devel
gmime-devel
gmp-devel
-gnokii-devel
gperf xmlto
GraphicsMagick-devel
gsl-devel
@@ -64,8 +68,8 @@ libacl-devel
libart_lgpl-devel
libattr-devel
libavahi-devel
-libavcodec-devel
libblkid-devel
+libboost_python3-devel
libbz2-devel
libcap-devel
libcdio-devel
@@ -86,7 +90,6 @@ libical-devel
libidn-devel
libiw-devel
libjack-devel
-libjasper-devel
liblcms2-devel
liblo-devel
liblrdf-devel
@@ -114,6 +117,7 @@ libraw1394-devel
librsvg-devel
libsamplerate-devel
libSDL-devel
+libsensors4-devel
libsmbclient-devel
libsndfile-devel
libtag-devel
@@ -140,6 +144,8 @@ libXt-devel
libXtst-devel
libXv-devel
libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
lilo
lirc-devel
make
@@ -148,10 +154,12 @@ meanwhile-devel
Mesa-devel
Mesa-libGL-devel
mozilla-nspr-devel
+net-snmp-devel
net-tools
net-tools-deprecated
NetworkManager-devel
ocaml
+openexr
openexr-devel
opensc
openslp-devel
@@ -162,14 +170,19 @@ patch
pciutils-devel
pcre-devel
pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
pkcs11-helper-devel
postgresql
postgresql-devel
python-devel
-qt-devel
+python-gtk-devel
+python3-devel
+recode
rpcgen
rpm-build
-rsvg-view
+rpm-devel
+rsvg-convert
ruby
ruby-devel
sane-backends-devel
@@ -180,6 +193,17 @@ subversion-devel
sudo
swig
sword-devel
+texlive-adjustbox
+texlive-etoc
+texlive-hanging
+texlive-metafont-bin
+texlive-multirow
+texlive-natbib
+texlive-newunicodechar
+texlive-refman
+texlive-sectsty
+texlive-stackengine
+texlive-tocloft
torsocks
transfig
unixODBC-devel
@@ -187,6 +211,7 @@ update-desktop-files
usbutils
utempter-devel
valgrind
+vim
wireless-tools
wv2-devel
xcb-proto-devel
diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros
index 0f4902670..cb1ceaa06 100644
--- a/redhat/docker/osstw/rpmmacros
+++ b/redhat/docker/osstw/rpmmacros
@@ -1,3 +1,4 @@
%dist .osstw
%_smp_mflags -j8
%jobs 8
+%__python %__python2
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index d1ad003ed..cdfd0cf21 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -17,7 +17,9 @@ file
filesystem
findutils
fuse
+fuse-common
gawk
+gcrypt
gdk-pixbuf2.0
glibc
glibc-devel
@@ -25,7 +27,8 @@ gnupg
gnutls
grep
gzip
-icu56-data
+icu
+icu65-data
info-install
kernel-userspace-headers
krb5
@@ -33,10 +36,13 @@ ldetect-lst
less
lib64acl1
lib64apt-pkg0
+lib64assuan0
lib64attr1
lib64audit1
lib64audit-devel
lib64blkid1
+lib64brotlicommon1
+lib64brotlidec1
lib64bsd0
lib64bzip2_1
lib64cap2
@@ -46,26 +52,32 @@ lib64curl4
lib64db4.8
lib64dbnss4.8
lib64elfutils1
+lib64expat1
lib64ext2fs2
lib64fdisk1
lib64ffi6
lib64fuse2
+lib64fuse3_3
+lib64gcrypt20
lib64gdbm3
lib64gdk_pixbuf2.0_0
lib64gio2.0_0
lib64glib2.0_0
lib64gmp10
lib64gnutls30
-lib64icu56
+lib64gpg-error0
+lib64gudev1.0_0
+lib64icu65
lib64idn2_0
lib64intl8
lib64iso9660_7
-lib64jasper1
+lib64jasper4
lib64jbig1
lib64jpeg62
lib64jpeg8
lib64keyutils1
lib64krb53
+lib64ksba8
lib64ldap2.4_2
lib64libcap-ng0
lib64lua5.1
@@ -76,12 +88,12 @@ lib64mpfr4
lib64ncurses5
lib64ncurses6
lib64ncursesw6
-lib64nettle6
+lib64nettle7
lib64notify4
+lib64npth0
lib64nspr4
lib64nss3
-lib64openssl1.0.0
-lib64openssl1.1
+lib64openssl1.1.0
lib64opts25
lib64pam0
lib64pam-devel
@@ -93,10 +105,12 @@ lib64png16_16
lib64png3
lib64popt0
lib64psl5
+lib64python3.6
lib64readline7
lib64rpm1
lib64rtmp1
lib64sasl2
+lib64secret1_0
lib64sigsegv2
lib64smartcols1
lib64sqlite3_0
@@ -105,23 +119,30 @@ lib64tasn1_6
lib64tcb0
lib64tiff3
lib64tiff5
+lib64tirpc3
lib64udev0
lib64unistring2
lib64usb1.0_0
lib64usb-compat0.1_4
lib64uuid1
lib64verto1
+lib64webp7
lib64x11_6
lib64xau6
+lib64xcrypt1
+lib64xcrypt-devel
lib64xdmcp6
lib64xml2_2
+lib64zstd1
libgcc1
libidn2-i18n
libnotify
libstdc++6
+libtirpc
libxcb
makedev
mktemp
+multiarch-utils
ncurses
nss
nss_tcb
@@ -134,10 +155,13 @@ perl
perl-base
perl-File-Sync
perl-MDK-Common
+perl-Module-ScanDeps
+pinentry
pkgconfig
popt-data
procps
publicsuffix-list-dafsa
+python3
rmt
rootcerts
rpm
@@ -145,6 +169,7 @@ rpm-helper
rpm-pclinuxos-setup
rpm-rambo-setup
run-parts
+sd
sed
setup
shadow-utils
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index e4ed68567..837e4c86f 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
#!/bin/bash -ex
NAME="pclinuxos"
-VERSION="$1" # E.g: '26'
+VERSION="${1:-2020}" # E.g: '26'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
@@ -17,7 +17,7 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r
mkdir -p "/dev/shm/packages"
while read pkg; do
- file="$(grep "^$pkg-[0-9]" /dev/shm/pkg.list)"
+ file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
[ -z "${file}" ] && exit 1
wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2
done < "pclinuxos.pkg"
@@ -46,7 +46,7 @@ sudo umount "${INSTALLROOT}/dev/shm"
sudo umount "${INSTALLROOT}/dev"
sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
-sudo rm -rf "${INSTALLROOT}"
+#sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
docker import "${IMAGE}.tar" "${IMAGE}"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 6ace1d446..2cd400aba 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,32 +1,48 @@
-FROM pclinuxos:2018
+FROM pclinuxos:2020
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
# Update distribution
-RUN apt-get -y update
-RUN apt-get -y dist-upgrade
+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 install $(</packages)
+RUN apt-get -y update && apt-get -y install $(</packages)
# Add rpmbuild repositories
ADD 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"
-# 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
-
# 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
-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
+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"
+
+USER trinity
+ADD 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 \
+ && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
+
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
+
+USER root
+RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
+
+USER trinity
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index e6d7358f0..800b9989a 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -14,6 +14,7 @@ cups-devel
desktop-file-utils
djvulibre
docbook-style-xsl
+docbook2x
doxygen
drakconf
dssi-devel
@@ -30,7 +31,6 @@ gamin-devel
gcc-c++
gettext-devel
glib2-devel
-gnokii-devel
gnutls-devel
gpgme-devel
gphoto2-devel
@@ -40,31 +40,42 @@ gtk2-devel
gtk+3.0-devel
hspell-devel
htdig
+iceauth
ImageMagick-devel
imake
imlib2-devel
+intltool
java-devel
+java-sun
lcms-devel
+lib64clucene-devel
lib64cryptsetup-devel
+lib64db4.8-devel
lib64dvdread-devel
lib64exiv2-devel
+lib64fbclient-devel
+lib64geoip-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,10 +87,8 @@ libflac++-devel
libfontenc-devel
libgadu-devel
libgstreamer0.10-devel
-libical-devel
libice-devel
-libjack-devel
-libjasper-devel
+lib64jasper-devel
libjpeg-devel
liblame-devel
liblo-devel
@@ -102,6 +111,7 @@ libqalculate-devel
libraw1394-devel
librsvg
librsync-devel
+libsamplerate-devel
libsmbclient-devel
libsm-devel
libt1lib-devel
@@ -142,13 +152,17 @@ opensc
openslp-devel
pam-devel
perl-devel
+perl-PAR-Packer
+perl-pcsc-perl
pilot-link-devel
+pkgconfig(pygtk-2.0)
postgresql
postgresql-devel
pth-devel
python3
python-devel
python-rpm
+qt4-devel
recode
rpm-build
rpm-devel
@@ -162,6 +176,7 @@ subversion-devel
sudo
sword-devel
taglib-devel
+texinfo
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..186ff1b22 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,15 +4,17 @@ 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"
+[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")"
mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
-mkdir -p "/dev/shm/docker"
+mkdir -p "/dev/shm/${DOCKER}"
+chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
case "${TDE_VERSION}" in
"14.0."*) TDE_BRANCH="r14.0.x";;
@@ -21,10 +23,10 @@ esac
mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
-docker run -ti --rm --privileged \
+${DOCKER} run -ti --rm --privileged \
-h "${IMAGE}" \
--name "${IMAGE//:/-}" \
- -v /dev/shm/docker:/tmp:z \
+ -v /dev/shm/${DOCKER}:/tmp:z \
-u trinity \
-e TMPPATH=/tmp \
-e TDE_VERSION=${TDE_VERSION} \