diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile index 3a63eff..2808700 100644 --- a/Dockerfiles/ubuntu2404.dockerfile +++ b/Dockerfiles/ubuntu2404.dockerfile @@ -2,13 +2,12 @@ FROM ubuntu:24.04 LABEL maintainer="amass <168062547@qq.com>" ENV DEBIAN_FRONTEND=noninteractive -ENV BOOST_VERSION=1_86_0 -ENV QT_VERSION=6.8.1 -ENV CODE_VERSION=4.96.2 +ENV BOOST_VERSION=1_87_0 +ENV QT_VERSION=6.8.2 +ENV CODE_VERSION=4.96.4 ENV LIBDATACHANNEL_VERSION=0.22.4 -ENV WT_VERSION=4.11.1 -ENV NNG_VERSION=1.10 -ENV TCPING_VERSION=2.7.0 +ENV NNG_VERSION=1.10.1 +ENV TCPING_VERSION=2.7.1 RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \ && apt update \ @@ -110,22 +109,13 @@ RUN cd /root \ && cmake --install build \ && rm -fr /root/nng-${NNG_VERSION}* -RUN cd /root \ - && wget https://github.com/emweb/wt/archive/${WT_VERSION}.tar.gz -O wt-${WT_VERSION}.tar.gz \ - && tar xvf wt-${WT_VERSION}.tar.gz \ - && cd /root/wt-${WT_VERSION} \ - && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/wt-${WT_VERSION} -DENABLE_QT4=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF -DBOOST_ROOT=/opt/Libraries/boost_${BOOST_VERSION} \ - && cmake --build build --target all \ - && cmake --install build \ - && rm -fr /root/wt-${WT_VERSION}* - RUN cd /root \ && git clone --recursive --depth 1 -b v${LIBDATACHANNEL_VERSION} https://github.com/paullouisageneau/libdatachannel.git \ && cd libdatachannel \ && cmake -G Ninja -B build -S . -DUSE_GNUTLS=0 -DUSE_NICE=0 -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/libdatachannel-${LIBDATACHANNEL_VERSION} \ && cmake --build build --target all \ && cmake --install build \ - && rm -fr /root/libdatachannel* + && rm -fr /root/libdatachannel RUN cd /root \ && wget https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz \ @@ -135,10 +125,10 @@ RUN cd /root \ && cmake --build build --target all \ && cmake --install build \ && rm -fr /root/libjpeg-turbo-3.1.0* - -RUN wget https://github.com/pouriyajamshidi/tcping/releases/download/v${TCPING_VERSION}/tcping_Linux.tar.gz -O /tmp/tcping_Linux.tar.gz \ - && tar -xzf /tmp/tcping_Linux.tar.gz -C /usr/bin \ - && rm /tmp/tcping_Linux.tar.gz + +RUN wget https://github.com/pouriyajamshidi/tcping/releases/download/v${TCPING_VERSION}/tcping-linux-amd64-static.tar.gz -O /tmp/tcping-linux-amd64-static.tar.gz \ + && tar -xzf /tmp/tcping-linux-amd64-static.tar.gz -C /usr/bin \ + && rm /tmp/tcping-linux-amd64-static.tar.gz RUN cd /root \ && wget https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz \