diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile index ddd2bd7..3b3e3ca 100644 --- a/Dockerfiles/ubuntu2404.dockerfile +++ b/Dockerfiles/ubuntu2404.dockerfile @@ -2,10 +2,11 @@ FROM ubuntu:24.04 LABEL maintainer="amass <168062547@qq.com>" ENV DEBIAN_FRONTEND=noninteractive -ENV BOOST_VERSION=1_86_0 +ENV BOOST_VERSION=1.86.0 ENV QT_VERSION=6.8.1 -ENV CODE_VERSION=4.96.1 +ENV CODE_VERSION=4.96.2 ENV WT_VERSION=4.11.1 +ENV NNG_VERSION=1.10 RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \ && apt update \ @@ -77,15 +78,15 @@ ENV PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH ENV LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH RUN cd /root \ - && BOOST_VERSION_DOT=$(echo $BOOST_VERSION | tr '_' '.') \ - && wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.gz \ - && tar xvf boost_${BOOST_VERSION}.tar.gz > /dev/null \ - && cd /root/boost_${BOOST_VERSION} \ - && ./bootstrap.sh --prefix=/opt/Libraries/boost_${BOOST_VERSION} \ - && ./b2 install -q --prefix=/opt/Libraries/boost_${BOOST_VERSION} threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \ - && rm -fr /root/boost_${BOOST_VERSION}* \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:LD_LIBRARY_PATH' >> /etc/profile -ENV LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:LD_LIBRARY_PATH + && BOOST_VERSION_UNDERLINE=$(echo $BOOST_VERSION | tr '.' '_') \ + && wget https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERLINE}.tar.gz \ + && tar xvf boost_${BOOST_VERSION_UNDERLINE}.tar.gz > /dev/null \ + && cd /root/boost_${BOOST_VERSION_UNDERLINE} \ + && ./bootstrap.sh --prefix=/opt/Libraries/boost_${BOOST_VERSION_UNDERLINE} \ + && ./b2 install -q --prefix=/opt/Libraries/boost_${BOOST_VERSION_UNDERLINE} threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \ + && rm -fr /root/boost_${BOOST_VERSION_UNDERLINE}* \ + && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION_UNDERLINE}/lib:LD_LIBRARY_PATH' >> /etc/profile +ENV LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION_UNDERLINE}/lib:LD_LIBRARY_PATH RUN cd /root \ && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \ @@ -97,21 +98,22 @@ RUN cd /root \ && rm -fr /root/mbedtls-3.6.2* RUN cd /root \ - && wget https://github.com/nanomsg/nng/archive/refs/tags/v1.9.0.tar.gz -O nng-1.9.0.tar.gz \ - && tar xvf nng-1.9.0.tar.gz \ - && cd /root/nng-1.9.0 \ + && wget https://github.com/nanomsg/nng/archive/refs/tags/v${NNG_VERSION}.tar.gz -O nng-${NNG_VERSION}.tar.gz \ + && tar xvf nng-${NNG_VERSION}.tar.gz \ + && cd /root/nng-${NNG_VERSION} \ && sed -i 's/# PATH_SUFFIXES lib/PATH_SUFFIXES lib/' cmake/FindMbedTLS.cmake \ && sed -i '/_MBEDTLS_LIBRARY/{n;n;n;n;s/#PATH_SUFFIXES lib/PATH_SUFFIXES lib/}' cmake/FindMbedTLS.cmake \ - && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/nng-1.9.0 -DNNG_ELIDE_DEPRECATED=ON -DNNG_ENABLE_TLS=ON -DMBEDTLS_ROOT=/opt/Libraries/mbedtls-3.6.2 -D_MBEDTLS_V2_OR_NEWER=ON \ + && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/nng-${NNG_VERSION} -DNNG_ELIDE_DEPRECATED=ON -DNNG_ENABLE_TLS=ON -DMBEDTLS_ROOT=/opt/Libraries/mbedtls-3.6.2 -D_MBEDTLS_V2_OR_NEWER=ON \ && cmake --build build --target all \ && cmake --install build \ - && rm -fr /root/nng-1.9.0* + && rm -fr /root/nng-${NNG_VERSION}* RUN cd /root \ + && BOOST_VERSION_UNDERLINE=$(echo $BOOST_VERSION | tr '.' '_') \ && 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 -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_UNDERLINE} \ && cmake --build build --target all \ && cmake --install build \ && rm -fr /root/wt-${WT_VERSION}*