Add runit to fix chpst error (#237)

* Add env FIX_DATA_VOLUME_PERMISSIONS to allow user to choose whether to chown the data folder

* Add another log

APP_VERSION

@@ -1 +1 @@
-5.0.1
+5.4.0

Caddyfile

@@ -10,6 +10,7 @@ redir /ui/ / 301
 redir /rclone /rclone/ 301
 redir /files /files/ 301
 
+reverse_proxy /rpc 127.0.0.1:6800
 reverse_proxy /jsonrpc 127.0.0.1:6800
 
 route /rclone/* {

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>
 
@@ -39,6 +39,7 @@ 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
 
 ADD install.sh aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/
 ADD conf /app/conf

README.md

@@ -4,7 +4,7 @@ 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")
 
@@ -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)
@@ -65,12 +68,12 @@ File Browser
 ### 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>
+* 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
@@ -136,6 +139,7 @@ Then simply run `docker-compose up -d`, that's it!
 | `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 +148,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 +164,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 +207,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

@@ -14,6 +14,7 @@ redir /ui/ / 301
 redir /rclone /rclone/ 301
 redir /files /files/ 301
 
+reverse_proxy /rpc 127.0.0.1:6800
 reverse_proxy /jsonrpc 127.0.0.1:6800
 
 route /rclone/* {

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,7 +3,7 @@
 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)
@@ -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

init.sh

@@ -8,13 +8,19 @@ 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 \

install.sh

@@ -2,10 +2,10 @@
 
 echo "[INFO] Set variables for $(arch)"
 
-caddy_version=2.6.2
+caddy_version=2.6.4
 filebrowser_version=v2.23.0
-rclone_version=v1.61.1
-ariang_version=1.3.2
+rclone_version=v1.62.2
+ariang_version=1.3.4
 
 case "$(arch)" in
 
@@ -34,10 +34,10 @@ 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/ \
@@ -65,6 +65,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