Rollback caddy to 2.0.0

.github/workflows/dockerimage.yml

@@ -53,18 +53,15 @@ jobs:
         docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Login to DockerHub
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PASS }}
     -
       name: Push docker images to Dockerhub
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       run: |
         docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Inspect image
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       run: |
         docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}

Dockerfile

@@ -6,7 +6,6 @@ WORKDIR /app
 
 ENV RPC_SECRET=""
 ENV ENABLE_AUTH=false
-ENV ENABLE_RCLONE=true
 ENV DOMAIN=http://localhost
 ENV ARIA2_USER=user
 ENV ARIA2_PWD=password

README.CN.md

@@ -103,7 +103,6 @@ services:
 ### 支持的 Docker 环境变量
 
   * ENABLE_AUTH 启用 Basic auth(网页简单认证) 用户认证
-  * ENABLE_RCLONE 是否启用 RCLONE，由于Rclone 的初次运行需要从Github 下载文件，由于你懂的原因，可能文件下载失败，进而导致整个程序崩溃,这时你需要设置为`false`
   * ARIA2_USER Basic Auth 用户认证用户名，Rclone也使用该参数
   * ARIA2_PWD Basic Auth 密码，Rclone也使用该参数
   * ARIA2_EXTERNAL_PORT 从外部可以访问到的 Aria2 端口，默认为 HTTP 的`80`

README.md

@@ -113,7 +113,6 @@ Then simply run `docker-compose up -d`, that's it!
 ### Supported Environment Variables
 
   * ENABLE_AUTH whether to enable Basic auth
-  * ENABLE_RCLONE whether to disable Rclone, if you running this container offline or do not have stable connection to Github, please set to `false`
   * ARIA2_USER Basic Auth username, Rclone GUI uses it as well.
   * ARIA2_PWD Basic Auth password, Rclone GUI uses it as well.
   * ARIA2_EXTERNAL_PORT The Aria2 port which exposed to public to access to

install.sh

@@ -2,7 +2,7 @@
 
 echo "Set variables for $(arch)"
 
-caddy_version=2.3.0
+caddy_version=2.0.0
 filebrowser_version=v2.11.0
 rclone_version=v1.53.3
 ariang_version=1.1.7

rclone.sh

@@ -1,14 +1,9 @@
 #! /bin/bash -eu
 
-if [ "$ENABLE_RCLONE" = "true" ]; then
-  echo "Start Rclone, please make sure you can connect to Github website. if not, please set docker env ENABLE_RCLONE=false"
-  rclone rcd --rc-web-gui \
-    --rc-web-gui-no-open-browser \
-    --rc-addr :5572 \
-    --rc-user $ARIA2_USER \
-    --rc-pass $ARIA2_PWD \
-    --cache-dir /app/.cache
-else
-  echo "Skip starting Rclone as it's been disabled"
-  sleep 3650d
-fi
+echo "Start Rclone"
+rclone rcd --rc-web-gui \
+  --rc-web-gui-no-open-browser \
+  --rc-addr :5572 \
+  --rc-user $ARIA2_USER \
+  --rc-pass $ARIA2_PWD \
+  --cache-dir /app/.cache