RPM: massive update and cleanup

4 files changed, 61 insertions, 35 deletions

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