diff --git a/ubuntu2404-qt6.dockerfile b/ubuntu2404-qt6.dockerfile index ae76907..010a42a 100644 --- a/ubuntu2404-qt6.dockerfile +++ b/ubuntu2404-qt6.dockerfile @@ -1,6 +1,6 @@ FROM registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 -ENV QT_VERSION=6.8.2 +ENV QT_VERSION=6.9.0 RUN cd /root \ && apt update \ @@ -8,7 +8,7 @@ RUN cd /root \ && apt install -y libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavfilter-dev libavdevice-dev \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && wget https://download.qt.io/official_releases/qt/6.8/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz \ + && wget https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz \ && tar -xvf qt-everywhere-src-${QT_VERSION}.tar.xz > /dev/null \ && cd ./qt-everywhere-src-${QT_VERSION} \ && ./configure -prefix /opt/Qt/${QT_VERSION}/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \ diff --git a/ubuntu2404.dockerfile b/ubuntu2404.dockerfile index f08b3fa..0d7552f 100644 --- a/ubuntu2404.dockerfile +++ b/ubuntu2404.dockerfile @@ -6,10 +6,11 @@ ARG USER_NAME=amass ARG USER_UID=1000 ARG USER_GID=100 -ENV BOOST_VERSION=1_87_0 -ENV CODE_VERSION=4.98.0 -ENV LIBDATACHANNEL_VERSION=0.22.5 +ENV BOOST_VERSION=1_88_0 +ENV CODE_VERSION=4.99.2 +ENV LIBDATACHANNEL_VERSION=0.22.6 ENV NNG_VERSION=1.10.1 +ENV MBEDTLS_VERSION=3.6.3 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 \ @@ -53,13 +54,13 @@ RUN cd /root \ ENV LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/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 \ - && tar xvf mbedtls-3.6.2.tar.bz2 \ - && cd /root/mbedtls-3.6.2 \ - && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/mbedtls-3.6.2 \ + && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-${MBEDTLS_VERSION}/mbedtls-${MBEDTLS_VERSION}.tar.bz2 \ + && tar xvf mbedtls-${MBEDTLS_VERSION}.tar.bz2 \ + && cd /root/mbedtls-${MBEDTLS_VERSION} \ + && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/mbedtls-${MBEDTLS_VERSION} \ && cmake --build build --target all \ && cmake --install build \ - && rm -fr /root/mbedtls-3.6.2* + && rm -fr /root/mbedtls-${MBEDTLS_VERSION}* RUN cd /root \ && wget https://github.com/nanomsg/nng/archive/refs/tags/v${NNG_VERSION}.tar.gz -O nng-${NNG_VERSION}.tar.gz \ @@ -67,7 +68,7 @@ RUN cd /root \ && 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-${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 -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-${MBEDTLS_VERSION} -D_MBEDTLS_V2_OR_NEWER=ON \ && cmake --build build --target all \ && cmake --install build \ && rm -fr /root/nng-${NNG_VERSION}*