amass/Older
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resume wt.
Some checks failed
Deploy Docker Images / Build dockerfile and Server deploy (push) Has been cancelled
Details
Deploy / Build (push) Failing after 16m16s
Details

Browse Source
This commit is contained in:
amass 2025-02-07 17:18:10 +00:00
parent b139a9bc12
commit 70451e735a
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,9 +7,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(Libraries_ROOT /opt/Libraries) set(Libraries_ROOT /opt/Libraries)
set(Wt_DIR ${Libraries_ROOT}/wt-4.11.1/lib/cmake/wt) set(Wt_DIR ${Libraries_ROOT}/wt-4.11.2/lib/cmake/wt)
set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS) set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS)
set(nng_DIR ${Libraries_ROOT}/nng-1.10/lib/cmake/nng) set(nng_DIR ${Libraries_ROOT}/nng-1.10.1/lib/cmake/nng)
set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.4/lib/cmake/LibDataChannel) set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.4/lib/cmake/LibDataChannel)
if(APPLE) if(APPLE)

12
Dockerfiles/ubuntu2404.dockerfile
View File

@ -2,11 +2,12 @@ FROM ubuntu:24.04
LABEL maintainer="amass <168062547@qq.com>" LABEL maintainer="amass <168062547@qq.com>"
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV BOOST_VERSION=1_87_0 ENV BOOST_VERSION=1_86_0
ENV QT_VERSION=6.8.2 ENV QT_VERSION=6.8.2
ENV CODE_VERSION=4.96.4 ENV CODE_VERSION=4.96.4
ENV LIBDATACHANNEL_VERSION=0.22.4 ENV LIBDATACHANNEL_VERSION=0.22.4
ENV NNG_VERSION=1.10.1 ENV NNG_VERSION=1.10.1
ENV WT_VERSION=4.11.2
ENV TCPING_VERSION=2.7.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 \ RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \
@ -126,6 +127,15 @@ RUN cd /root \
&& cmake --install build \ && cmake --install build \
&& rm -fr /root/libjpeg-turbo-3.1.0* && rm -fr /root/libjpeg-turbo-3.1.0*
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 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 \ 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 \ && tar -xzf /tmp/tcping-linux-amd64-static.tar.gz -C /usr/bin \
&& rm /tmp/tcping-linux-amd64-static.tar.gz && rm /tmp/tcping-linux-amd64-static.tar.gz

12
Server/conf/nginx.conf
View File

@ -42,21 +42,21 @@ http {
} }
upstream twikoo { upstream twikoo {
server 127.0.0.1:8083;
}
upstream frp_http_proxy {
server 127.0.0.1:8084; server 127.0.0.1:8084;
} }
upstream frp_https_proxy { upstream frp_http_proxy {
server 127.0.0.1:8085; server 127.0.0.1:8085;
} }
upstream frp_board { upstream frp_https_proxy {
server 127.0.0.1:8086; server 127.0.0.1:8086;
} }
upstream frp_board {
server 127.0.0.1:8087;
}
upstream frp_pve { upstream frp_pve {
server 127.0.0.1:8088; server 127.0.0.1:8088;
} }