summaryrefslogtreecommitdiffstats
path: root/redhat/docker/mga6/Dockerfile.i686
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/docker/mga6/Dockerfile.i686')
-rw-r--r--redhat/docker/mga6/Dockerfile.i68637
1 files changed, 24 insertions, 13 deletions
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index 956755001..798cb8c3d 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:6
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
ARG ARCH=i686
# Reset URPMI repositories to default
@@ -15,21 +15,32 @@ RUN urpmi.update -a
RUN urpmi --auto-select --auto
# Install Trinity build dependencies
-ADD packages.${ARCH} /etc/urpmi/packages
-RUN while ! urpmi --auto $(</etc/urpmi/packages); do urpmi.update -a; done
+ADD packages.${ARCH} /packages
+RUN urpmi --auto $(</packages)
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix poppler include causing FTBFS
+RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|"
# Add non-root user to build packages
RUN rm -rf /home/trinity
RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"