diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 14:34:02 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 22:29:41 +0100 |
| commit | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch) | |
| tree | 85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/docker/pclinuxos/Dockerfile.x86_64 | |
| parent | 87e57a1a070839a44db16a0410ef57902db2df3e (diff) | |
| download | tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip | |
RPM: massive update and cleanup
Diffstat (limited to 'redhat/docker/pclinuxos/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 6ace1d446..2cd400aba 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,32 +1,48 @@ -FROM pclinuxos:2018 +FROM pclinuxos:2020 -ARG TDE_VERSION=14.0.6 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Update distribution -RUN apt-get -y update -RUN apt-get -y dist-upgrade +RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN apt-get -y install $(</packages) +RUN apt-get -y update && apt-get -y install $(</packages) # Add rpmbuild repositories ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" -# 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 - # Fix SUDO configuration -RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" +#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter # Fix missing '.la' files ADD genla.sh /usr/bin/genla.sh -RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 -RUN genla.sh libjpeg -RUN genla.sh liblcms -RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la +RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ + && genla.sh libjpeg \ + && genla.sh liblcms \ + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la + +# Add non-root user to build packages +RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec + +USER root +RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm + +USER trinity |