summaryrefslogtreecommitdiffstats
path: root/redhat/docker/el8
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/docker/el8')
-rw-r--r--redhat/docker/el8/Dockerfile.x86_644
-rw-r--r--redhat/docker/el8/packages5
-rw-r--r--redhat/docker/el8/rpmmacros2
3 files changed, 9 insertions, 2 deletions
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index f2e00c95c..2bc43a412 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -32,6 +32,10 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
# Fix utempter detection
RUN chmod a+r /usr/libexec/utempter/utempter
+# Fix python3.6 detection (tdebindings; kvirc)
+RUN ln -sfv python3.6m /usr/include/python3.6 \
+ && ln -sfv python3 /usr/bin/python
+
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 06283e94e..38d1c15b6 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -26,6 +26,8 @@ createrepo_c
cryptsetup-devel
cups-devel
dbus-glib-devel
+djvu-libre
+djvu-libre-devel
docbook2X
doxygen
emacs
@@ -187,8 +189,6 @@ ppp
psutils
pulseaudio-libs-devel
pylibacl
-python2
-python2-devel
python3
python3-devel
python3-pyxattr
@@ -224,6 +224,7 @@ valgrind
wget
wireless-tools-devel
xine-lib-devel
+xkeyboard-config-devel
xmlto
xorg-x11-font-utils
xscreensaver
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
index dc2cb7e68..d2d495cbe 100644
--- a/redhat/docker/el8/rpmmacros
+++ b/redhat/docker/el8/rpmmacros
@@ -3,3 +3,5 @@
%jobs 8
%_debugsource_packages %nil
%_debugsource_template %nil
+%python python3
+%__python /usr/bin/python3