Bump versions for Caddy, Filebrowser, Rclone, and Ariang (#249)

Updated version numbers for Caddy, Filebrowser, Rclone, and Ariang.

.github/workflows/dockerimage.yml

@@ -50,7 +50,7 @@ jobs:
       uses: docker/setup-buildx-action@v1
     -
       name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache
       with:
         path: /tmp/.buildx-cache

APP_VERSION

@@ -1 +1 @@
-5.0.0
+6.2.2

Caddyfile

@@ -9,7 +9,9 @@ redir /ui / 301
 redir /ui/ / 301
 redir /rclone /rclone/ 301
 redir /files /files/ 301
+redir /ro /ro/ 301
 
+reverse_proxy /rpc 127.0.0.1:6800
 reverse_proxy /jsonrpc 127.0.0.1:6800
 
 route /rclone/* {
@@ -22,6 +24,14 @@ route /files/* {
 	reverse_proxy 127.0.0.1:8080
 }
 
+route /ro/* {
+	uri strip_prefix /ro
+	root * /data
+	file_server {
+		browse "{$CADDY_FILE_SERVER_BROWSE_HTML}"
+	}
+}
+
 route /ping {
 	respond "app version: {env.APP_VERSION}"
 }

Dockerfile

@@ -1,6 +1,6 @@
-FROM golang:alpine AS build-forego
+FROM golang AS build-forego
 
-RUN apk add --no-cache git openssh
+RUN apt update && apt install -y git
 
 WORKDIR /app
 
@@ -11,7 +11,7 @@ RUN git clone https://github.com/wahyd4/forego.git \
     && go build -o forego \
     && chmod +x forego
 
-FROM alpine:edge
+FROM debian:stable-slim
 
 LABEL AUTHOR=Junv<wahyd4@gmail.com>
 
@@ -34,13 +34,16 @@ ENV XDG_CONFIG_HOME=/app/.caddy/config
 ENV XDG_CACHE_HOME=/app/.cache
 ENV RCLONE_CONFIG_BASE64=""
 ENV ENABLE_APP_CHECKER=true
+ENV ENABLE_FILEBROWSER=true
 ENV CADDY_LOG_LEVEL=INFO
 ENV RCLONE_AUTO_UPLOAD_PROVIDER=
 ENV RCLONE_AUTO_UPLOAD_REMOTE_PATH=/downloads
 ENV RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE=1K
 ENV RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE=100G
+ENV FIX_DATA_VOLUME_PERMISSIONS=false
+ENV CADDY_FILE_SERVER_BROWSE_HTML=/app/browse.html
 
-ADD install.sh aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/
+ADD install.sh aria2c.sh caddy.sh filebrowser.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/
 ADD conf /app/conf
 ADD Caddyfile SecureCaddyfile HerokuCaddyfile /usr/local/caddy/
 

HerokuCaddyfile

@@ -5,7 +5,9 @@
 
 :PORT
 
-basicauth / {
+@protected path / /index.html /css/* /js/* /ro /ro/* /jsonrpc
+
+basicauth @protected {
 	ARIA2_USER ARIA2_PWD_ENCRYPT
 }
 
@@ -13,6 +15,7 @@ redir /ui / 301
 redir /ui/ / 301
 redir /rclone /rclone/ 301
 redir /files /files/ 301
+redir /ro /ro/ 301
 
 reverse_proxy /jsonrpc 127.0.0.1:6800
 
@@ -26,6 +29,14 @@ route /files/* {
 	reverse_proxy 127.0.0.1:8080
 }
 
+route /ro/* {
+	uri strip_prefix /ro
+	root * /data
+	file_server {
+		browse "{$CADDY_FILE_SERVER_BROWSE_HTML}"
+	}
+}
+
 route /ping {
 	respond "app version: {env.APP_VERSION}"
 }

Procfile

@@ -1,5 +1,5 @@
 caddy: /app/caddy.sh
-filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data -b /files
+filebrowser: /app/filebrowser.sh
 aria2c: /app/aria2c.sh
 rclone: /app/rclone.sh
 newer_version_checker: /app/new-version-checker.sh

README.md

@@ -4,9 +4,9 @@ English | [简体中文](https://github.com/wahyd4/aria2-ariang-docker/blob/mast
 
 [![](https://images.microbadger.com/badges/image/wahyd4/aria2-ui.svg)](https://microbadger.com/images/wahyd4/aria2-ui "Get your own image badge on microbadger.com")
 [![Docker Pulls](https://img.shields.io/docker/pulls/wahyd4/aria2-ui.svg)](https://hub.docker.com/r/wahyd4/aria2-ui/)
-[![Github Build](https://github.com/wahyd4/aria2-ariang-docker/workflows/Docker%20Image%20CI/badge.svg)](https://github.com/wahyd4/aria2-ariang-docker/actions)
+[![Github Build](https://github.com/wahyd4/aria2-ariang-docker/actions/workflows/dockerimage.yml/badge.svg)](https://github.com/wahyd4/aria2-ariang-docker/actions)
 
-[![Page Views Count](https://badges.toozhao.com/svg/aria2-ariang-docker)](https://badges.toozhao.com/stats/aria2-ariang-docker "Page Views Count")
+![Page Views Count](https://badges.toozhao.com/svg/aria2-ariang-docker)
 
 
 
@@ -23,6 +23,9 @@ English | [简体中文](https://github.com/wahyd4/aria2-ariang-docker/blob/mast
   - [Supported Environment Variables](#supported-environment-variables)
   - [Supported Volumes](#supported-volumes)
 - [Auto HTTPS enabling](#auto-https-enabling)
+- [Download Automation 🤖](#download-automation-)
+  - [Download file through iPhone/Mac Shortcuts app.](#download-file-through-iphonemac-shortcuts-app)
+  - [Download file through cURL](#download-file-through-curl)
 - [Build the image by yourself](#build-the-image-by-yourself)
 - [Docker Hub](#docker-hub)
 - [Running it on Kubernetes (My favorite)](#running-it-on-kubernetes-my-favorite)
@@ -58,19 +61,20 @@ File Browser
 
 * wahyd4/aria2-ui:latest
 
-> Docker will pick the the proper ARCH for you. e.g. arm64v8 or x86_64
+> Docker will pick proper CPU ARCH for you. e.g. arm64v8 or x86_64
 
 ## How to run
 
 ### Quick run
 
 ```shell
-  docker run -d --name aria2-ui -p 80:80 wahyd4/aria2-ui
+  docker run -d --name aria2-ui -p 8000:80 wahyd4/aria2-ui
 ```
 
-* Aria2: <http://yourip>
-* FileManger: <http://yourip/files>
-* Rclone: <http://yourip/rclone>
+* Aria2: <http://yourip:8000>
+* Caddy File Server(Read Only) <http://yourip:8000/ro>
+* FileManger: <http://yourip:8000/files>
+* Rclone: <http://yourip:8000/rclone>
 * Please use `admin`/`admin` as username and password to login `Filebrowser` for the first time. And use `user`/`password` to login `Rclone` if you don't update `ARIA2_USER` and `ARIA2_PWD`
 
 ### Full features run
@@ -121,7 +125,8 @@ Then simply run `docker-compose up -d`, that's it!
 | ENV | Description|
 |:---|:---|
 | `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`
+| `ENABLE_RCLONE` | Whether to disable Rclone, if you running this container offline or do not have stable connection to Github, please set to `false` |
+| `ENABLE_FILEBROWSER` | Whether to disable Filebrowser, set it to `false` to disable it, by default it's enabled |
 | `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 |
@@ -131,11 +136,12 @@ Then simply run `docker-compose up -d`, that's it!
 | `DOMAIN` | The domain you'd like to bind, when domain is a `https://` thing, then auto TLS feature will be enabled |
 | `RCLONE_CONFIG_BASE64` | Inject and config Rclone through `base64` string, which is the only way to use Rclone on Heroku. Please use `cat /app/conf/rclone.conf \| base64` or any base64 online tools such as [this](https://www.base64encode.org/) to encode your `rclone.conf` as bse64 string. Note, you need to set `ENABLE_RCLONE` to true as well. |
 | `ENABLE_APP_CHECKER` | By default it's set to `true` to check if any new docker image version release on daily basis, which can help you get notification when new features released as well as some security vulnerabilities get fixed. You can set it to `false` to disable this feature. Note: you still need to manually pull the new image version and re run the docker container to complete upgrading. |
-| CADDY_LOG_LEVEL | For specifying the log level of Caddy, set it to `ERROR` to reduce logs. Default: `INFO` |
-| RCLONE_AUTO_UPLOAD_PROVIDER | The Rclone remote storage provider name, which can be found under `Rclone -> Configs`, default `""`, which means auto upload is disabled. When the value is not empty, then the files will be attempted to be uploaded.|
-| RCLONE_AUTO_UPLOAD_REMOTE_PATH | The file folder in remote cloud storage provider, default `/downloads`|
-| RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE | Set the minimum file size of auto uploader, files smaller than it won't be uploaded, default `1K`  |
-| RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE | Set the limit of the Max file can be uploaded to 3rd party storage provider, default `100G`. |
+| `CADDY_LOG_LEVEL` | For specifying the log level of Caddy, set it to `WARN` or`ERROR` to reduce logs. Default: `INFO` |
+| `RCLONE_AUTO_UPLOAD_PROVIDER` | The Rclone remote storage provider name, which can be found under `Rclone -> Configs`, default `""`, which means auto upload is disabled. When the value is not empty, then the files will be attempted to be uploaded.|
+| `RCLONE_AUTO_UPLOAD_REMOTE_PATH` | The file folder in remote cloud storage provider, default `/downloads`|
+| `RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE` | Set the minimum file size of auto uploader, files smaller than it won't be uploaded, default `1K`  |
+| `RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE` | Set the limit of the Max file can be uploaded to 3rd party storage provider, default `100G`. |
+| `FIX_DATA_VOLUME_PERMISSIONS` | Default value is `false`. When set to `true`, the container will run `chown -R` command against `/data` folder and `PUID` and `PGID` you set. Please set it to `true` when container complains you don't have enough permissions to manage the files and folders you mounted.|
 
 
 ### Supported Volumes
@@ -144,7 +150,7 @@ Then simply run `docker-compose up -d`, that's it!
 |:---|:---|
 | `/data` | The folder contains all the files you download. |
 | `/app/conf/key` | The folder which stores Aria2 SSL `certificate` and `key` |file. `Notice`: The certificate file should be named `aria2.crt` and the key file should be named `aria2.key` |
-| `/app/conf` | The Aria2 configuration and file session folder. Make sure you have `aria2.conf` and `aria2.session` file. For the first time `aria2.session` just need to be a empty file can be appended. You can also user the templates for these two file in the `conf` folder of this project. Please put your `rclone.conf` in this folder as well if you'd mount it to Rclone. So all the config files supported in this folder are: `aria2.conf`, `aria2.session`, `rclone.conf`. 🚨Warning🚨: if you don't mount `/app/conf`, whenever the container restarts, you'll lose your downloading progress. |
+| `/app/conf` | The Aria2 configuration and file session folder. 🚨Please make sure you have `aria2.conf` and `aria2.session` file exist on your host, when yout mount /app/conf. For the first time `aria2.session` just need to be a empty file can be appended. You can also user the templates for these two file in the `conf` folder of this project. Please put your `rclone.conf` in this folder as well if you'd mount it to Rclone. So all the config files supported in this folder are: `aria2.conf`, `aria2.session`, `rclone.conf`. 🚨Warning🚨: if you don't mount `/app/conf`, whenever the container restarts, you'll lose your downloading progress. |
 |`/app/conf/aria2.conf` | See description above👆🏼 |
 |`/app/conf/aria2.session` | See description above👆🏼 |
 |`/app/conf/rclone.conf` | See description above👆🏼 |
@@ -160,6 +166,18 @@ Make sure you have added proper `A` record point to the host you running to your
 ```bash
 docker run -d --name aria2-ui -p 80:80 -p 443:443 -e DOMAIN=https://toozhao.com wahyd4/aria2-ui
 ```
+## Download Automation 🤖
+
+### Download file through iPhone/Mac Shortcuts app.
+
+First [Download Shortcut](https://www.icloud.com/shortcuts/7483b8cec7484c0f98b72882d0f1e3e2), then follow the promots to setup aria2-ui URL and RPC_SECRET. Then you are all ready to go, just to run the shortcut and provide the file URL which you want to download or the magnet/torrent file URL.
+
+### Download file through cURL
+
+```bash
+curl http://<ip>:<port>/jsonrpc -d "{\"jsonrcp\":\"2.0\",\"id\":\"someID\",\"method\":\"aria2.addUri\",\"params\":[\"token:someToken\",[\"http://some_file_url\"],{\"dir\":\"/data/downloads\"}]}"
+```
+
 ## Build the image by yourself
 
 ```bash
@@ -191,3 +209,4 @@ I couldn't tell you how to run it in Kubernetes step by step, but once you have
   2. If there is no speed at all when you downloading a BitTorrent file, please try to use a popular torrent file first to help the application to cache `DHT` file. Then the speed should get fast and fast, as well as downloading other links.
   3. If you see any errors related to `setcap` which probably means the Linux you are running doesn't support running this application with `non-root` user. So please specify the `PUID` and `PGID` to `0` explicitly to use `root` user to run it.
   4. How can I get `Rclone` authenticated? Due to Rclone is running in this docker image only as a component rather than an application, you can only interact with it via `/rclone` endpoint, and no other ports. So the web browser authentication mechanism doesn't work here. Please configure Rclone through command line within the container. You can follow the official doc [Configuring rclone on a remote / headless machine](https://rclone.org/remote_setup) or this [issue](https://github.com/wahyd4/aria2-ariang-docker/issues/118)
+  5. Why the app stopped working when I have `- v /<some-folder>:/app/conf` mounted. It happens when you mount the entire `/app/conf` folder but you don't have any files under that folder on your host. To fix this issue, please simply copy all files under [`conf`](https://github.com/wahyd4/aria2-ariang-docker/tree/master/conf) folder to your local folder that you mount to `/app/conf` and then rerun the container.

SecureCaddyfile

@@ -5,7 +5,9 @@ log {
 	output stderr
 }
 
-basicauth / {
+@protected path / /index.html /css/* /js/* /ro /ro/* /jsonrpc
+
+basicauth @protected {
 	ARIA2_USER ARIA2_PWD_ENCRYPT
 }
 
@@ -13,7 +15,9 @@ redir /ui / 301
 redir /ui/ / 301
 redir /rclone /rclone/ 301
 redir /files /files/ 301
+redir /ro /ro/ 301
 
+reverse_proxy /rpc 127.0.0.1:6800
 reverse_proxy /jsonrpc 127.0.0.1:6800
 
 route /rclone/* {
@@ -26,6 +30,14 @@ route /files/* {
 	reverse_proxy 127.0.0.1:8080
 }
 
+route /ro/* {
+	uri strip_prefix /ro
+	root * /data
+	file_server {
+		browse "{$CADDY_FILE_SERVER_BROWSE_HTML}"
+	}
+}
+
 route /ping {
 	respond "app version: {env.APP_VERSION}"
 }

aria2c.sh

@@ -1,21 +1,26 @@
 #! /bin/bash -eu
 
 sed -i 's/6800/'"${ARIA2_EXTERNAL_PORT}"'/g' /usr/local/www/aria2/js/aria-ng*.js
-RPC_SECRET_BASE64=$(echo -n ${RPC_SECRET}|base64)
+RPC_SECRET_BASE64=$(echo -n ${RPC_SECRET} | base64)
 sed -i 's/secret:\"\"/secret:\"'"${RPC_SECRET_BASE64}"'\"/g' /usr/local/www/aria2/js/aria-ng*.js
 
-if [ "$ARIA2_SSL" = "true" ]; then
-echo "[INFO] Start aria2 with secure config"
+if [[ "${ARIA2_SSL}" = "true" ]]; then
+  echo "[INFO] Start aria2 with secure config and rpc-secret"
 
-/usr/bin/aria2c --conf-path="/app/conf/aria2.conf" \
---enable-rpc --rpc-listen-all \
---rpc-certificate=/app/conf/key/aria2.crt \
---rpc-private-key=/app/conf/key/aria2.key \
---rpc-secret="$RPC_SECRET" --rpc-secure \
+  /usr/bin/aria2c --conf-path="/app/conf/aria2.conf" \
+    --enable-rpc --rpc-listen-all \
+    --rpc-certificate=/app/conf/key/aria2.crt \
+    --rpc-private-key=/app/conf/key/aria2.key \
+    --rpc-secret="${RPC_SECRET}" --rpc-secure
 
+elif [[ "${ARIA2_SSL}" = "false" ]] && [[ "${RPC_SECRET}" != "" ]]; then
+  echo "[INFO] Start aria2 with rpc-secret"
+  /usr/bin/aria2c --conf-path="/app/conf/aria2.conf" \
+    --enable-rpc \
+    --rpc-listen-all \
+    --rpc-secret="${RPC_SECRET}"
 else
-
-echo "[INFO] Start aria2 with standard mode"
-/usr/bin/aria2c --conf-path="/app/conf/aria2.conf" --enable-rpc --rpc-listen-all
+  echo "[INFO] Start aria2 with standard mode"
+  /usr/bin/aria2c --conf-path="/app/conf/aria2.conf" --enable-rpc --rpc-listen-all
 
 fi

caddy.sh

@@ -3,21 +3,21 @@
 echo "[INFO] Run aria2c and ariaNG"
 
 echo "[INFO] Generate basic auth password for caddy"
-ARIA2_PWD_ENCRYPT=$(caddy hash-password -plaintext ${ARIA2_PWD})
+ARIA2_PWD_ENCRYPT=$(caddy hash-password --plaintext ${ARIA2_PWD})
 
 case $ENABLE_AUTH in
 true)
   echo "[INFO] Use Basic Auth config file "
   export CADDY_FILE=/usr/local/caddy/SecureCaddyfile
-  sed -i 's/ARIA2_USER/'"${ARIA2_USER}"'/g' ${CADDY_FILE}
-  sed -i 's/ARIA2_PWD_ENCRYPT/'"${ARIA2_PWD_ENCRYPT}"'/g' ${CADDY_FILE}
+  sed -i "s#ARIA2_USER#${ARIA2_USER}#g" ${CADDY_FILE}
+  sed -i "s#ARIA2_PWD_ENCRYPT#${ARIA2_PWD_ENCRYPT}#g" ${CADDY_FILE}
   ;;
 
 heroku)
   echo "[INFO] Run Caddy with Heroku mode"
   export CADDY_FILE=/usr/local/caddy/HerokuCaddyfile
-  sed -i 's/ARIA2_USER/'"${ARIA2_USER}"'/g' ${CADDY_FILE}
-  sed -i 's/ARIA2_PWD_ENCRYPT/'"${ARIA2_PWD_ENCRYPT}"'/g' ${CADDY_FILE}
+  sed -i "s#ARIA2_USER#${ARIA2_USER}#g" ${CADDY_FILE}
+  sed -i "s#ARIA2_PWD_ENCRYPT#${ARIA2_PWD_ENCRYPT}#g" ${CADDY_FILE}
 
   sed -i 's/PORT/'"${PORT}"'/g' ${CADDY_FILE}
 
@@ -28,4 +28,4 @@ heroku)
   ;;
 esac
 
-/usr/local/bin/caddy run -config ${CADDY_FILE} -adapter=caddyfile
+/usr/local/bin/caddy run --config ${CADDY_FILE} --adapter=caddyfile

filebrowser.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -eu
+
+echo "Checking if FileBrowser is enabled..."
+
+if [ "$ENABLE_FILEBROWSER" = "true" ]; then
+    echo "Starting FileBrowser..."
+    /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data -b /files
+else
+    echo "FileBrowser is disabled. Set ENABLE_FILEBROWSER=true to enable it."
+    sleep 3650d
+fi

init.sh

@@ -8,17 +8,24 @@ mkdir -p /app/.caddy
 mkdir -p /app/.cache
 mkdir -p /app/.cache/aria2
 
+echo "[INFO] Run chown against app related folders and user ${PUID}"
+
 chown -R junv:junv \
          /app \
          /app/.caddy \
          /app/.cache \
          /usr/local \
-         /var/log \
-         /data
+         /var/log
+
+if [[ "${FIX_DATA_VOLUME_PERMISSIONS}" = "true" ]]; then
+  echo "[INFO] Setup user ${PUID} proper permissions for /data"
+  chown -R junv:junv /data
+fi
 
 chmod +x /app/caddy.sh \
          /app/rclone.sh \
-         /app/aria2c.sh
+         /app/aria2c.sh \
+         /app/filebrowser.sh
 
 echo "[INFO] Give caddy permissions to use low ports"
 setcap cap_net_bind_service=+ep /usr/local/bin/caddy

install.sh

@@ -2,10 +2,10 @@
 
 echo "[INFO] Set variables for $(arch)"
 
-caddy_version=2.4.6
-filebrowser_version=v2.21.1
-rclone_version=v1.58.0
-ariang_version=1.2.3
+caddy_version=2.10.2
+filebrowser_version=v2.44.2
+rclone_version=v1.71.2
+ariang_version=1.3.11
 
 case "$(arch)" in
 
@@ -34,14 +34,15 @@ esac
 
 filebrowser_file=${platform}-filebrowser.tar.gz
 ariang_file=AriaNg-${ariang_version}.zip
-
-adduser -D -u 1000 junv \
-  && apk update \
-  && apk add runit shadow wget bash curl openrc gnupg aria2 tar mailcap fuse vim --no-cache \
+groupadd junv \
+  && useradd -g junv -m -s /bin/bash junv \
+  && apt update \
+  && apt install -y wget curl aria2 tar unzip libcap2-bin runit\
   && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_version}/${caddy_file} \
   && tar -zxf ${caddy_file} \
   && mv caddy /usr/local/bin/ \
   && rm -rf ${caddy_file} \
+  && wget -P /app -N https://raw.githubusercontent.com/glowinthedark/caddy-file-server-browse-extension/39e997c91539d0f04fcce53a3cb6605b2ae9e50c/browse.html \
   && platform=linux-amd64 \
   && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${filebrowser_file} \
   && tar -zxf ${filebrowser_file} \
@@ -65,6 +66,9 @@ adduser -D -u 1000 junv \
   && unzip ${ariang_file} \
   && rm -rf ${ariang_file} \
   && chmod -R 755 /usr/local/www/aria2 \
+  && mkdir -p /data && chown junv:junv /data \
   && mkdir -p /data/cloud \
   && chown junv:junv /data/cloud \
-  && ln -s /data/cloud /app
+  && ln -s /data/cloud /app \
+  && apt remove -y unzip\
+  && apt clean