diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile index 3b3e3ca..2b58e58 100644 --- a/Dockerfiles/ubuntu2404.dockerfile +++ b/Dockerfiles/ubuntu2404.dockerfile @@ -2,7 +2,7 @@ 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.2 ENV WT_VERSION=4.11.1 @@ -56,7 +56,7 @@ RUN cd /opt \ && cd /opt/emsdk \ && ./emsdk install latest \ && ./emsdk activate latest \ - && echo 'export PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH' >> /etc/profile + && echo "export PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH" >> /etc/profile ENV PATH=/opt/emsdk:/opt/emsdk/node/20.18.0_64bit/bin:/opt/emsdk/upstream/emscripten:$PATH RUN cd /root \ @@ -72,21 +72,21 @@ RUN cd /root \ && cmake --build . --parallel > /dev/null \ && ninja install \ && rm -fr /root/qt-everywhere-src-${QT_VERSION}* \ - && echo 'export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH' >> /etc/profile \ - && echo 'export LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile + && echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH" >> /etc/profile \ + && echo "export LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH" >> /etc/profile 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_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 + && BOOST_VERSION_DOT=$(echo $BOOST_VERSION | tr '_' '.') \ + && wget https://archives.boost.io/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 RUN cd /root \ && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \ @@ -109,11 +109,10 @@ RUN cd /root \ && 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_UNDERLINE} \ + && 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}* @@ -168,7 +167,7 @@ RUN cd /root \ && cmake --build build --target all \ && cmake --install build \ && rm -fr /root/ZLMediaKit \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile + && echo "export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH" >> /etc/profile ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH ENV LANG=C.UTF-8