summaryrefslogtreecommitdiffstats
path: root/redhat/docker/mga7
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2019-11-03 11:26:19 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2019-11-03 11:26:19 +0100
commit096e163b680861784102352fb1883d967f114433 (patch)
tree644e72acda6e41be818e63f4b94148837456c8e0 /redhat/docker/mga7
parentaea1ff0939a3189717eef06cda052860db755ce7 (diff)
downloadtde-packaging-096e163b680861784102352fb1883d967f114433.tar.gz
tde-packaging-096e163b680861784102352fb1883d967f114433.zip
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/mga7')
-rw-r--r--redhat/docker/mga7/Dockerfile.i68630
-rw-r--r--redhat/docker/mga7/Dockerfile.x86_6430
-rw-r--r--redhat/docker/mga7/packages.i6866
-rw-r--r--redhat/docker/mga7/packages.x86_649
4 files changed, 50 insertions, 25 deletions
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index af381b17e..93da2907b 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:7
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
ARG ARCH=i686
# Reset URPMI repositories to default
@@ -18,18 +18,26 @@ RUN urpmi --auto-select --auto
ADD packages.${ARCH} /packages
RUN urpmi --auto $(</packages)
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
# Add non-root user to build packages
RUN rm -rf /home/trinity
RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 2a567685b..b8d29a318 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM mageia:7
-ARG TDE_VERSION=14.0.6
+ARG TDE_VERSION=14.0.7
ARG ARCH=x86_64
# Reset URPMI repositories to default
@@ -18,18 +18,26 @@ RUN urpmi --auto-select --auto
ADD packages.${ARCH} /packages
RUN urpmi --auto $(</packages)
-# Add rpmbuild repositories
-RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
# Add non-root user to build packages
RUN rm -rf /home/trinity
RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
-# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+# Configure user trinity
+USER trinity
+ADD rpmmacros ${HOME}/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
+RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index 471051206..da20adaac 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -23,6 +23,7 @@ dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
@@ -128,7 +129,6 @@ libhd-devel
libical-devel
libice-devel
libifp-devel
-libinotifytools-devel
libiodbc-devel
libiw-devel
libjack-devel
@@ -186,6 +186,7 @@ net-snmp-devel
NetworkManager-glib-devel
notification-daemon
ocaml
+ocaml-facile-devel
OpenEXR-devel
openldap-devel
openldap-servers-devel
@@ -196,7 +197,10 @@ optipng
pam-devel
pciutils-devel
perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
perl(XML::Parser)
+perl-pcsc-perl
pilot-link-devel
pinentry-gtk2
pkgconfig(audiofile)
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 7954d51b9..ba6b8e05c 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -23,6 +23,7 @@ dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
@@ -73,6 +74,7 @@ lib64cryptsetup-devel
lib64curl-devel
lib64dvdread-devel
lib64ecpg9.6_6
+lib64exiv2-devel
lib64fbclient-devel
lib64ffmpeg-devel
lib64flac-devel
@@ -97,7 +99,7 @@ lib64tiff-devel
lib64twolame-devel
lib64udev-devel
lib64usb1.0-devel
-lib64utempter
+lib64utempter0
lib64utempter-devel
lib64v4l-devel
lib64xaw-devel
@@ -128,7 +130,6 @@ libhd-devel
libical-devel
libice-devel
libifp-devel
-libinotifytools-devel
libiodbc-devel
libiw-devel
libjack-devel
@@ -186,6 +187,7 @@ net-snmp-devel
NetworkManager-glib-devel
notification-daemon
ocaml
+ocaml-facile-devel
OpenEXR-devel
openldap-devel
openldap-servers-devel
@@ -196,7 +198,10 @@ optipng
pam-devel
pciutils-devel
perl-devel
+perl(IPC::Run3)
+perl(PAR::Packer)
perl(XML::Parser)
+perl-pcsc-perl
pilot-link-devel
pinentry-gtk2
pkgconfig(audiofile)