v7.3.0

.github/workflows/jvm-ci.yml

@@ -62,18 +62,66 @@ jobs:
           type=raw,ci-jvm-universal
           type=raw,ci
           type=sha
+    - name: Build and push Docker image (Primary)
+      uses: docker/[email protected]
+      with:
+        context: .
+        file: ./Dockerfile-Primary
+        push: true
+        platforms: |
+          linux/amd64
+          linux/arm64/v8
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}-jvm-universal
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+    - name: Build and push Docker image (Secondary)
+      uses: docker/[email protected]
+      with:
+        context: .
+        file: ./Dockerfile-Secondary
+        push: true
+        platforms: |
+          linux/riscv64
+          linux/ppc64le
+        tags: ${{ steps.meta.outputs.tags }}-secondary
+        labels: ${{ steps.meta.outputs.labels }}-secondary
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+  Build_Docker_Standalone:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set Up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set Up Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/[email protected]
+      with:
+        images: ghostchu/peerbanhelper-snapshot
+        tags: |
+          type=ref,event=branch
+          type=ref,event=tag
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=raw,ci-jvm-universal
+          type=raw,ci
+          type=sha
     - name: Build and push Docker image
       uses: docker/[email protected]
       with:
         context: .
         file: ./Dockerfile
-        push: true
+        push: false
         platforms: |
           linux/amd64
           linux/arm64/v8
           linux/riscv64
           linux/ppc64le
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}-jvm-universal
+        tags: ${{ steps.meta.outputs.tags }}-secondary
+        labels: ${{ steps.meta.outputs.labels }}-secondary
         cache-from: type=gha
         cache-to: type=gha,mode=max

.github/workflows/jvm-release.yml

@@ -158,15 +158,28 @@ jobs:
             type=raw,latest-jvm-universal
             type=raw,latest
             type=sha
-      - name: Build and push Docker image
+      - name: Build and push Docker image (Primary - Popular architecture)
         uses: docker/[email protected]
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile-Primary
           push: true
           platforms: |
             linux/amd64
             linux/arm64/v8
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}-jvm-universal
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            GIT_HASH=${{ github.sha }}
+      - name: Build and push Docker image (Secondary - Non popular architecture)
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./Dockerfile-Secondary
+          push: true
+          platforms: |
             linux/riscv64
             linux/ppc64le
           tags: ${{ steps.meta.outputs.tags }}
@@ -175,14 +188,16 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             GIT_HASH=${{ github.sha }}
+
+
       # ---------------- ALIYUN ACR --------------------
       - name: Log in to Aliyun ACR
         uses: docker/login-action@v3
         with:
           registry: "registry.cn-hangzhou.aliyuncs.com"
           username: ${{ secrets.ALIYUN_ACR_USERNAME }}
           password: ${{ secrets.ALIYUN_ACR_PASSWORD }}
-      - name: Extract metadata (tags, labels) for Aliyun ACR
+      - name: Extract metadata (tags, labels) for Aliyun ACR (Primary - Popular architecture)
         id: meta-acr
         uses: docker/[email protected]
         with:
@@ -196,18 +211,29 @@ jobs:
             type=raw,latest-jvm-universal
             type=raw,latest
             type=sha
-      - name: Build and push Aliyun ACR
+      - name: Build and push Aliyun ACR (Primary)
         uses: docker/[email protected]
         with:
           context: .
-          file: ./Dockerfile-Release
+          file: ./Dockerfile-Primary
           push: true
           platforms: |
             linux/amd64
             linux/arm64/v8
-            linux/riscv64
-            linux/ppc64le
           tags: ${{ steps.meta-acr.outputs.tags }}
           labels: ${{ steps.meta-acr.outputs.labels }}-jvm-universal
           cache-from: type=gha
           cache-to: type=gha,mode=max
+      - name: Build and push Aliyun ACR (Secondary - Non popular architecture)
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./Dockerfile-Secondary
+          push: true
+          platforms: |
+            linux/riscv64
+            linux/ppc64le
+          tags: ${{ steps.meta-acr.outputs.tags }}-secondary
+          labels: ${{ steps.meta-acr.outputs.labels }}-secondary
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -50,3 +50,4 @@ dependency-reduced-pom.xml
 
 PeerBanHelper.jar
 *.pkg
+install4j/output

Dockerfile-Primary

@@ -0,0 +1,12 @@
+# 主 Dockerfile，构建主流架构平台的镜像 (amd64, aarch64)，使用 Musl 版本的 Liberica JRE 23，压缩体积
+FROM docker.io/bellsoft/liberica-runtime-container:jre-23-slim-musl
+LABEL maintainer="https://github.com/PBH-BTN/PeerBanHelper"
+COPY target/libraries /app/libraries
+COPY target/PeerBanHelper.jar /app/PeerBanHelper.jar
+USER 0
+EXPOSE 9898
+ENV TZ=UTC
+ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
+WORKDIR /app
+VOLUME /tmp
+ENTRYPOINT ["sh", "-c", "${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar PeerBanHelper.jar"]

Dockerfile-Release → Dockerfile-Secondary

@@ -1,11 +1,12 @@
-FROM docker.io/eclipse-temurin:23-jre-noble
+# 主 Dockerfile，构建其它架构平台的镜像 (risc-v, s390x 等)，使用 Alpine 版本的 Temurin JRE 23，压缩体积
+FROM docker.io/eclipse-temurin:23.0.1_11-jre
 LABEL maintainer="https://github.com/PBH-BTN/PeerBanHelper"
 COPY target/libraries /app/libraries
 COPY target/PeerBanHelper.jar /app/PeerBanHelper.jar
 USER 0
 EXPOSE 9898
 ENV TZ=UTC
-ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
+ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
 WORKDIR /app
 VOLUME /tmp
 ENTRYPOINT ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar PeerBanHelper.jar

README.EN.md

@@ -6,7 +6,7 @@ Automatically block unwanted, leeches and abnormal BT peers with support for cus
 ![page-views](https://raw.githubusercontent.com/PBH-BTN/views-counter/refs/heads/master/svg/754169590/badge.svg)
 ## Introduction
 
-Following function are provided by PeerBanHelper:
+The following functions are provided by PeerBanHelper:
 
 - [PeerID Blacklist](https://docs.pbh-btn.com/en/docs/module/peer-id)
 - [Client Name Blacklist](https://docs.pbh-btn.com/en/docs/module/client-name)
@@ -19,7 +19,7 @@ Following function are provided by PeerBanHelper:
 - [IP set subscribe](https://docs.pbh-btn.com/en/docs/module/ip-address-blocker-rules)
 - A modern WebUI
 
-In addition, PeerBanHelper downloads the GeoIP library at startup, and supports the following functions once it successful loaded:
+In addition, PeerBanHelper downloads the GeoIP library at startup and supports the following functions once it has been successfully loaded:
 - View IP address attribution, AS information (ASN, ISP, AS name, etc.), network type information (broadband, base station, IoT, data center, etc.) in the blocking list.
 - Based on GeoIP information, block IP addresses by country/region, city, network type, ASN and so on.
 - View GeoIP statistics
@@ -34,7 +34,7 @@ In addition, PeerBanHelper downloads the GeoIP library at startup, and supports
 - BiglyBT([plugin](https://github.com/PBH-BTN/PBH-Adapter-BiglyBT) is required)
 - Deluge([plugin](https://github.com/PBH-BTN/PBH-Adapter-Deluge) is required)
 - Azureus(Vuze)([plugin](https://github.com/PBH-BTN/PBH-Adapter-Azureus) is required)
-- Transmission **(deprecated；3.00-20 or higher)**
+- Transmission **(deprecated; 3.00-20 or higher)**
 - BitComet **v2.10 Beta6 [20240928] or higher** (P2SP LTSeed mode is not supported)
 
 
@@ -68,12 +68,22 @@ Any consequences caused by the user's use of this software are borne by the user
 
 [![Star History Chart](https://api.star-history.com/svg?repos=PBH-BTN/PeerBanHelper&type=Date)](https://star-history.com/#PBH-BTN/PeerBanHelper&Date)
 
+## Tools
+
+In the development process of PeerBanHelper, we have used many excellent professional tools. Thanks to the following companies or projects for providing open-source licenses:
+
 ### Install4j
 
 PeerBanHelper use [Install4j multi-platform installer builder](https://www.ej-technologies.com/products/install4j/overview.html) to build its multi-platform installer. Thanks the open-source license provided by ej-technolgies. Click the link or the image below to download install4j.
 
 [![Install4j](https://www.ej-technologies.com/images/product_banners/install4j_large.png)](https://www.ej-technologies.com/products/install4j/overview.html)
 
+### JProfiler
+
+PeerBanHelper use [JProfiler all-in one Java profiler](https://www.ej-technologies.com/jprofiler) to analyze and optimize the program. Thanks the open-source license provided by ej-technolgies. Click the link or the image below to download JProfiler.
+
+[![JProfiler](https://www.ej-technologies.com/images/product_banners/jprofiler_large.png)](https://www.ej-technologies.com/jprofiler)
+
 ## Credit
 
 ### Backend

README.md

@@ -69,13 +69,22 @@ PeerBanHelper 仅支持对传统 IPv4 或 IPv6 地址的反吸血，如遇 I2P 
 
 [![Star History Chart](https://api.star-history.com/svg?repos=PBH-BTN/PeerBanHelper&type=Date)](https://star-history.com/#PBH-BTN/PeerBanHelper&Date)
 
+## Tools
+
+在 PeerBanHelper 的开发过程中，我们使用到了许多优秀的专业工具。感谢下面的公司或项目慷慨的提供开源许可证：
 
 ### Install4j
 
 PeerBanHelper 使用 [Install4j multi-platform installer builder](https://www.ej-technologies.com/products/install4j/overview.html) 打包多平台安装程序。感谢 ej-technolgies 的开放源代码许可证。点击链接或者下面的图片下载 install4j。
 
 [![Install4j](https://www.ej-technologies.com/images/product_banners/install4j_large.png)](https://www.ej-technologies.com/products/install4j/overview.html)
 
+### JProfiler
+
+PeerBanHelper 使用 [JProfiler all-in one Java profiler](https://www.ej-technologies.com/jprofiler) 对程序进行性能分析与优化。感谢 ej-technolgies 的开放源代码许可证。点击链接或者下面的图片下载 JProfiler。
+
+[![JProfiler](https://www.ej-technologies.com/images/product_banners/jprofiler_large.png)](https://www.ej-technologies.com/jprofiler)
+
 ## Credit
 
 ### Backend