From e62e335aec09441287a607d8775b35a48a24a16e Mon Sep 17 00:00:00 2001
From: amass <amass.law1996@gmail.com>
Date: Thu, 12 Dec 2024 21:46:19 +0800
Subject: [PATCH] update docker build.

---
 Dockerfiles/ubuntu2204.dockerfile | 39 +++++++++++++++++--------------
 Dockerfiles/ubuntu2404.dockerfile | 39 +++++++++++++++++--------------
 Server/UdpServer.cpp              |  2 +-
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile
index 0abd078..e0b5076 100644
--- a/Dockerfiles/ubuntu2204.dockerfile
+++ b/Dockerfiles/ubuntu2204.dockerfile
@@ -2,6 +2,8 @@ FROM ubuntu:22.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.95.3
 ENV WT_VERSION=4.11.1
 
@@ -63,27 +65,28 @@ 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/6.8.0/single/qt-everywhere-src-6.8.0.tar.xz \
-    && tar -xvf qt-everywhere-src-6.8.0.tar.xz \
-    && cd ./qt-everywhere-src-6.8.0 \
-    && ./configure -prefix /opt/Qt/6.8.0/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \
+    && wget https://download.qt.io/official_releases/qt/6.8/${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 \
     && cmake --build . --parallel \
     && ninja install \
-    && rm -fr /root/qt-everywhere-src-6.8.0* \
-    && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile \
-    && echo 'export LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile
-ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH
-ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH
+    && 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
+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 \
-    && wget https://boostorg.jfrog.io/artifactory/main/release/1.87.0/source/boost_1_87_0.tar.gz \
-    && tar xvf boost_1_87_0.tar.gz > /dev/null \
-    && cd /root/boost_1_87_0 \
-    && ./bootstrap.sh --prefix=/opt/Libraries/boost_1_87_0 \
-    && ./b2 install -q --prefix=/opt/Libraries/boost_1_87_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \
-    && rm -fr /root/boost_1_87_0* \
-    && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_87_0/lib:LD_LIBRARY_PATH' >> /etc/profile
-ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_87_0/lib:LD_LIBRARY_PATH
+    && 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
 
 RUN cd /root \
     && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \
@@ -109,7 +112,7 @@ 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_1_86_0 \
+    && 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}*
diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile
index ca3d142..5e829ff 100644
--- a/Dockerfiles/ubuntu2404.dockerfile
+++ b/Dockerfiles/ubuntu2404.dockerfile
@@ -2,6 +2,8 @@ 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.95.3
 ENV WT_VERSION=4.11.1
 
@@ -62,27 +64,28 @@ 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/6.8.0/single/qt-everywhere-src-6.8.0.tar.xz \
-    && tar -xvf qt-everywhere-src-6.8.0.tar.xz \
-    && cd ./qt-everywhere-src-6.8.0 \
-    && ./configure -prefix /opt/Qt/6.8.0/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \
+    && wget https://download.qt.io/official_releases/qt/6.8/${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 \
     && cmake --build . --parallel \
     && ninja install \
-    && rm -fr /root/qt-everywhere-src-6.8.0* \
-    && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile \
-    && echo 'export LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile
-ENV PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH
-ENV LD_LIBRARY_PATH=/opt/Qt/6.8.0/gcc_64/lib:$LD_LIBRARY_PATH
+    && 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
+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 \
-    && wget https://boostorg.jfrog.io/artifactory/main/release/1.87.0/source/boost_1_87_0.tar.gz \
-    && tar xvf boost_1_87_0.tar.gz > /dev/null \
-    && cd /root/boost_1_87_0 \
-    && ./bootstrap.sh --prefix=/opt/Libraries/boost_1_87_0 \
-    && ./b2 install -q --prefix=/opt/Libraries/boost_1_87_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \
-    && rm -fr /root/boost_1_87_0* \
-    && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_87_0/lib:LD_LIBRARY_PATH' >> /etc/profile
-ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_87_0/lib:LD_LIBRARY_PATH
+    && 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
 
 RUN cd /root \
     && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \
@@ -108,7 +111,7 @@ 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_1_86_0 \
+    && 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}*
diff --git a/Server/UdpServer.cpp b/Server/UdpServer.cpp
index c86668a..8fa762d 100644
--- a/Server/UdpServer.cpp
+++ b/Server/UdpServer.cpp
@@ -16,7 +16,7 @@ UdpServer::UdpServer(boost::asio::io_context &io_context)
     sendData();
 
     boost::system::error_code error;
-    auto address = boost::asio::ip::address::from_string("127.0.0.1", error);
+    auto address = boost::asio::ip::make_address("127.0.0.1", error);
     if (error) {
         LOG(error) << error.message();
     } else {