optimize aria2

Author: bensonfx

nextcloud/aria2/Dockerfile

@@ -7,18 +7,14 @@ WORKDIR /root
 ARG ARIANG_URL="https://github.com/mayswind/AriaNg/releases"
 ENV RPC_SECRET=Hello ENABLE_AUTH=false DOMAIN=0.0.0.0:80 ARIA2_USER=user ARIA2_PWD=password
 
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
-    && apk add --no-cache wget bash curl openrc gnupg screen aria2 tar
-
-RUN curl https://getcaddy.com | bash -s personal http.realip
-
 ADD conf /root/conf
 COPY aria2c.sh /root
-
 COPY Caddyfile /usr/local/caddy/
 
-#AriaNg
 RUN set -ex \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache wget bash curl openrc gnupg screen aria2 tar \
+    && curl https://getcaddy.com | bash -s personal http.realip \
     && export ARIANG_VERSION=$(curl ${ARIANG_URL}/latest -si | grep 'Location:' | grep -oE "[0-9]{1,2}[0-9.]+") \
     && aria2_path=/usr/local/www/aria2 \
     && install -d ${aria2_path} ${aria2_path}/Download \
@@ -27,11 +23,11 @@ RUN set -ex \
     && curl -kL ${ARIANG_URL}/download/${ARIANG_VERSION}/AriaNg-${ARIANG_VERSION}.zip -o /root/AriaNg-${ARIANG_VERSION}.zip
 
 #The folder to store ssl keys
-VOLUME /root/conf/key
+VOLUME /root/conf/ssl
 # User downloaded files
 VOLUME /data
 
-EXPOSE 6800 80 443
+EXPOSE 6800 80
 
 CMD ["/bin/sh", "/root/aria2c.sh" ]
 

nextcloud/aria2/aria2c.sh

@@ -14,7 +14,11 @@ run_aria2() {
 
 prepare() {
     #local aria2_path=/usr/local/www/aria2
-    aria2_path=/var/www/html/aria
+    local aria2_path=${CADDY_ROOT}
+    if [ -z "$aria2_path" ] || [ ! -d "${aria2_path}" ];then
+        echo "$aria2_path do not exist"
+        return 1
+    fi
 
     local aria_ng=$(find /root/ -name AriaNg-*.zip)
     [ -d "$aria2_path" ] || install -d $aria2_path $aria2_path/Download
@@ -31,7 +35,11 @@ prepare() {
     echo "check version"
     local curr_ver=$(cd $aria2_path;grep -oE "buildVersion:\"v[0-9.]+" js/aria-ng-*.min.js |grep -oE "[0-9.]+")
     local docker_ver=$(find /root -name AriaNg-*.zip | grep -oE "[0-9.]+[0-9]")
-    [ -z "$docker_ver" ] && return
+
+    if [ -z "$docker_ver" ];then
+        echo "can not get ariaNg package"
+        return 0
+    fi
 
     if [ "$curr_ver" != "$docker_ver" ];then
         echo "update ariaNg version from $curr_ver to $docker_ver"
@@ -40,9 +48,8 @@ prepare() {
         unzip -o $aria_ng
         cd -
     fi
+    return 0
 }
 
 prepare
 run_aria2
-
-

nextcloud/docker-compose.yml

@@ -1,27 +1,20 @@
 version: '3'
 
 services:
-  nextcloud:
-    image: nextcloud:latest
-    volumes:
-      - ./data/nextcloud:/var/www/html
-      - ./data/user-files:/data
-    restart: always
   aria2:
     image: bensonfx/aria2-ui
     build: aria2
     ports:
       - "6800:6800"
-      # - "80:80"
-      # - "443:443"
     volumes:
       - ./data/user-files:/data
-    # volumes:
-    #   - /data/ssl:/root/conf/key
-    #   - ~/data/aria2/aria2.conf:/root/conf/aria2.conf
+    #   - ./data/ssl:/root/conf/ssl
     environment:
-      - DOMAIN=:80
-      # - SSL=true
+      - CADDY_SERVER=:80
+      - CADDY_ROOT=/var/www/html/aria2
+      # - ARIA2_RPC_SSL=true
+      # - ARIA2_RPC_KEY=/data/ssl/aria2.key
+      # - ARIA2_RPC_CERT=/data/ssl/aria2.crt
       # - RPC_SECRET=Hello
       # - ARIA2_USER=admin
       # - ARIA2_PWD=password