diff --git a/docker-compose.yml b/docker-compose.yml index c3969585..148b0d9e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,7 +74,7 @@ services: - USE_SJTUG=true - CLONE_VERSION=v0.1.18 - CLONE_V2_VERSION=v0.2.37 - - RSYNC_SJTUG_VERSION=v0.4.15 + - RSYNC_SJTUG_VERSION=v0.4.16 - LUG_VERSION=v0.12.10 expose: - 8081 @@ -211,6 +211,7 @@ services: - proxy-net expose: - 8080 + - 1080 restart: unless-stopped logging: options: diff --git a/lug/Dockerfile b/lug/Dockerfile index ef5f72a2..3c1e7a07 100644 --- a/lug/Dockerfile +++ b/lug/Dockerfile @@ -1,8 +1,8 @@ -FROM debian:bullseye +FROM debian:bookworm ARG USE_SJTUG -RUN if [ "$USE_SJTUG" = true ] ; then sed -i 's/http:\/\/deb.debian.org/http:\/\/mirror.sjtu.edu.cn/g' /etc/apt/sources.list ; fi -RUN if [ "$USE_SJTUG" = true ] ; then sed -i 's/http:\/\/security.debian.org/http:\/\/mirror.sjtu.edu.cn/g' /etc/apt/sources.list ; fi +RUN if [ "$USE_SJTUG" = true ] ; then sed -i 's/http:\/\/deb.debian.org/http:\/\/mirror.sjtu.edu.cn/g' /etc/apt/sources.list.d/debian.sources ; fi +RUN if [ "$USE_SJTUG" = true ] ; then sed -i 's/http:\/\/security.debian.org/http:\/\/mirror.sjtu.edu.cn/g' /etc/apt/sources.list.d/debian.sources ; fi WORKDIR /app RUN apt-get update && apt-get install rsync wget git jq curl unzip -y @@ -28,7 +28,7 @@ RUN /app/build-script/setup-julia.sh ENV PATH="/app/julia-1.5.0/bin:${PATH}" # Python packages -RUN if [ "$USE_SJTUG" = true ] ; then pip3 install python-dateutil -i https://mirror.sjtu.edu.cn/pypi/web/simple; else pip3 install python-dateutil ; fi +RUN apt-get install python3-dateutil -y # StorageMirrorServer.jl COPY build-script/setup-julia-mirror.sh build-script/setup-julia-mirror.sh diff --git a/lug/build-script/setup-php.sh b/lug/build-script/setup-php.sh index d64f42f2..a830cf56 100755 --- a/lug/build-script/setup-php.sh +++ b/lug/build-script/setup-php.sh @@ -3,7 +3,7 @@ set -e wget -q -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg if [ "$USE_SJTUG" = true ] ; then - echo "deb https://mirror.sjtu.edu.cn/sury/php/ bullseye main" > /etc/apt/sources.list.d/php.list + echo "deb https://mirror.sjtu.edu.cn/sury/php/ bookworm main" > /etc/apt/sources.list.d/php.list else - echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list + echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/php.list fi diff --git a/lug/worker-script/rsync-fetcher.sh b/lug/worker-script/rsync-fetcher.sh index 1c509ee9..0a1a042d 100755 --- a/lug/worker-script/rsync-fetcher.sh +++ b/lug/worker-script/rsync-fetcher.sh @@ -14,5 +14,9 @@ mkdir -p "${LUG_tmp_path}" LUG_timeout="${LUG_timeout:-4h}" +if [ "${LUG_use_proxy}" ]; then + export SOCKS5_PROXY=socks5://clash:1080 +fi + eval timeout $LUG_timeout /app/rsync_sjtug/rsync-gc --s3-url "\"${LUG_s3_api}\"" --s3-region "\"${LUG_s3_region}\"" --s3-bucket "\"${LUG_s3_bucket}\"" --s3-prefix "\"rsync/${LUG_name}\"" --pg-url "\"${LUG_pg}\"" --namespace "\"${LUG_name}\"" --keep "\"${LUG_keep}\"" --partial "\"${LUG_partial}\"" eval timeout $LUG_timeout /app/rsync_sjtug/rsync-fetcher --src "\"${LUG_source}\"" --s3-url "\"${LUG_s3_api}\"" --s3-region "\"${LUG_s3_region}\"" --s3-bucket "\"${LUG_s3_bucket}\"" --s3-prefix "\"rsync/${LUG_name}\"" --pg-url "\"${LUG_pg}\"" --namespace "\"${LUG_name}\"" --tmp-path "\"${LUG_tmp_path}\"" ${LUG_rsync_extra_flags}