diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-06-01 19:01:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-06-01 19:02:06 +0200 |
| commit | 191dbe0c32b56e88be8e5253f65833470e2eee0a (patch) | |
| tree | d72ef16536e261dae673c3049a20eb3eeeca18ac /redhat/docker/mga6/Dockerfile.x86_64 | |
| parent | 1c0f7ee5ef66d92c671fbeaac96faeffb1a8992d (diff) | |
| download | tde-packaging-191dbe0c32b56e88be8e5253f65833470e2eee0a.tar.gz tde-packaging-191dbe0c32b56e88be8e5253f65833470e2eee0a.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/docker/mga6/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/mga6/Dockerfile.x86_64 | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index b656182ec..d8d826d48 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -1,22 +1,20 @@ FROM mageia:6 -ARG TDE_VERSION=14.0.7 +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} /packages -RUN urpmi --auto $(</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\"|" @@ -28,22 +26,22 @@ RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define 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 # 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 +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 -RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" +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" |