diff options
Diffstat (limited to 'redhat/docker/pclinuxos/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 2aa9f8200..1d92b8a8a 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,13 +1,13 @@ -FROM pclinuxos:2021 +FROM pclinuxos:2024 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Update distribution # Install Trinity build dependencies COPY packages.${ARCH} /packages -RUN apt-get -y update \ - && apt-get -y install glibc \ +RUN set -x \ + && apt-get -y update \ && apt-get -y dist-upgrade \ && apt-get -y install $(</packages) @@ -26,8 +26,7 @@ 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 \ - && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so + && 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 \ @@ -56,3 +55,8 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM 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 + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ + && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm |