AriaNg:1.3.10

.github/workflows/aria2.yml

@@ -4,6 +4,7 @@ on:
   push:
     paths:
     - 'aria2/Dockerfile'
+    - 'aria2/Dockerfile.aria2c'
     - 'aria2/root/**'
   workflow_dispatch:
 
@@ -13,40 +14,58 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set env'
         run: |
-          echo "ARIA2_VER=$(echo `grep -n "ARIA2_VER=" aria2/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
           echo "AriaNg_VER=$(echo `grep -n "AriaNg_VER=" aria2/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
+          echo "ARIA2_VER=$(echo `grep -n "ARIA2_VER=" aria2/Dockerfile.aria2c`|awk -F= '{print $2}')" >> $GITHUB_ENV
+          echo "ALPINE_VER=$(echo `grep -n "FROM alpine" aria2/Dockerfile.aria2c`|awk -F: '{print $3}')" >> $GITHUB_ENV
 
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Check image exist
+        id: aria2c-check-step
+        run: |
+          if [ `DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect ghcr.io/gshang2017/aria2c:${{ env.ARIA2_VER }}-alpine-${{ env.ALPINE_VER }} > /dev/null  2>&1; echo $?` == "0" ];then echo "skipnext=true" >> $GITHUB_OUTPUT;fi
+
+      - name: Build and push
+        if : ( steps.aria2c-check-step.outputs.skipnext  != 'true' )
+        uses: docker/build-push-action@v6
+        with:
+          context: ./aria2
+          file: ./aria2/Dockerfile.aria2c
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ghcr.io/gshang2017/aria2c:latest
+            ghcr.io/gshang2017/aria2c:${{ env.ARIA2_VER }}-alpine-${{ env.ALPINE_VER }}
+
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./aria2
           file: ./aria2/Dockerfile

.github/workflows/aria2c.yml

@@ -1,49 +0,0 @@
-name: aria2c
-
-on:
-  push:
-    paths:
-    - 'aria2/Dockerfile.aria2c'
-  workflow_dispatch:
-
-jobs:
-  job1:
-    name: buildx tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: 'Set env'
-        run: |
-          echo "ARIA2_VER=$(echo `grep -n "ARIA2_VER=" aria2/Dockerfile.aria2c`|awk -F= '{print $2}')" >> $GITHUB_ENV
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: ./aria2
-          file: ./aria2/Dockerfile.aria2c
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: |
-            ghcr.io/gshang2017/aria2c:latest
-            ghcr.io/gshang2017/aria2c:${{ env.ARIA2_VER }}

aria2/Dockerfile

@@ -1,11 +1,11 @@
 #compiling aria2c
 FROM ghcr.io/gshang2017/aria2c:latest AS compilingaria2c
 
+
 # docker aria2
 FROM alpine:3.21
 
-ARG ARIA2_VER=1.37.0
-ARG AriaNg_VER=1.3.9
+ARG AriaNg_VER=1.3.10
 ARG S6_VER=3.2.0.2
 
 ENV UID=1000

aria2/README.md

@@ -15,7 +15,7 @@
 |名称|版本|说明|
 |:-|:-|:-|
 |Aria2|1.37.0|amd64;arm64v8;arm32v7,修改线程数至128，默认32，集成Trackers自动更新。|
-|AriaNg|1.3.9|Aria2的web管理界面|
+|AriaNg|1.3.10|Aria2的web管理界面|
 
 ### docker命令行设置：
 

aria2/root/usr/local/aria2/defaults/aria2.conf

@@ -1582,7 +1582,7 @@ piece-length=1M
 #zh_Hans#显示控制台输出 [true|false] 默认:true
 #zh_Hant#顯示控制台輸出 [true|false] 默認:true
 #en#Show Console Output [true|false] Default:true
-#show-console-readout=true
+show-console-readout=false
 
 #zh_Hans#设置下载进度摘要的输出间隔(秒). 设置为 0 禁止输出.
 #zh_Hans#下载摘要输出间隔 默认:60