diff options
Diffstat (limited to 'redhat/docker/pclinuxos/Dockerfile.x86_64')
-rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 85b9bb441..66036cba0 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ -FROM pclinuxos:2020 +FROM pclinuxos:2021 -ARG TDE_VERSION=14.0.9 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Update distribution @@ -26,7 +26,8 @@ COPY genla.sh /usr/bin/genla.sh 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 + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \ + && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so # Add non-root user to build packages RUN rm -rf /home/trinity \ @@ -37,15 +38,21 @@ USER trinity COPY 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 \ +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm -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 \ +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm -USER root -RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm -USER trinity +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm |