fix app.conf

Build aria2 ui docker image to integrate with nextcloud

.dockerignore

@@ -0,0 +1,3 @@
+README*.md
+LICENSE
+.github

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please try to use English to describe your question or issue.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.

.github/workflows/dockerimage.yml

@@ -1,14 +1,14 @@
 name: Docker Image CI
-
 on: [push]
-
 jobs:
-
   build:
- 
     runs-on: ubuntu-latest
- 
     steps:
-    - uses: actions/checkout@v1
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag aria-ui:$(date +%s)
+    - uses: actions/checkout@master
+    - name: Build and Publish main docker image to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: wahyd4/aria2-ui
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_PASS }}
+        snapshot: true

.travis.yml

@@ -1,22 +0,0 @@
-language: go
-services:
-  - docker
-
-addons:
-  apt:
-    packages:
-      - docker-ce
-
-jobs:
-  include:
-    - stage: "build and push docker image"
-      script: |
-        #! /bin/bash -eu
-        docker --version
-        docker build -t wahyd4/aria2-ui:3.0.${TRAVIS_BUILD_NUMBER} .
-        if [ "${TRAVIS_BRANCH}" = "master" ]; then
-          docker login -u $DOCKER_USER -p $DOCKER_PASS
-          docker tag wahyd4/aria2-ui:3.0.$TRAVIS_BUILD_NUMBER wahyd4/aria2-ui:latest
-          docker push wahyd4/aria2-ui:3.0.$TRAVIS_BUILD_NUMBER
-          docker push wahyd4/aria2-ui:latest
-        fi

Caddyfile

@@ -1,5 +1,5 @@
 {$DOMAIN} {
-  proxy / localhost:8080 {
+  proxy / file-manager {
       transparent
   }
 

Dockerfile

@@ -17,12 +17,7 @@ RUN adduser -D -u 1000 junv \
   && apk update \
   && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \
   && curl https://getcaddy.com | bash -s personal \
-  && filebrowser_version=v2.0.12 \
   && platform=linux-amd64 \
-  && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${platform}-filebrowser.tar.gz \
-  && tar -zxvf ${platform}-filebrowser.tar.gz \
-  && rm -rf ${platform}-filebrowser.tar.gz \
-  && rm LICENSE README.md \
   && wget -N https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-${platform}.tgz \
   && tar -zxvf forego-stable-${platform}.tgz \
   && rm -rf forego-stable-${platform}.tgz \

Procfile

@@ -1,3 +1,2 @@
-filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data
 caddy: /app/caddy.sh
 aria2c: /app/aria2c.sh

README.CN.md

@@ -4,9 +4,10 @@ Aria2 + AriaNg
 
 [![](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/)
-[![Build Status](https://travis-ci.org/wahyd4/aria2-ariang-docker.svg?branch=master)](https://travis-ci.org/wahyd4/aria2-ariang-docker)
 [![Github Build](https://github.com/wahyd4/aria2-ariang-docker/workflows/Docker%20Image%20CI/badge.svg)](https://github.com/wahyd4/aria2-ariang-docker/actions)
 
+<img src="https://raw.githubusercontent.com/wahyd4/work-in-australia/766592ac6318027d7b3c334d8c50ca80818eeff8/wepay.jpg" alt="buy me a drink" width="120"/>
+
 本镜像包含 Aria2、AriaNg 和File Manager，主要方便那些用户期望只运行一个镜像就能实现图形化下载文件和在线播放文件。（类似离线下载的功能），只使用一个 Docker 镜像也方便用户在群晖NAS 中运行本程序。
 
 - [功能特性](#功能特性)
@@ -15,12 +16,12 @@ Aria2 + AriaNg
   - [快速运行](#快速运行)
   - [开启所有功能](#开启所有功能)
   - [使用docker-compose 运行](#使用docker-compose-运行)
-  - [支持的 Docker 环境变量](#支持的-Docker-环境变量)
-  - [支持的 Docker volume 属性](#支持的-Docker-volume-属性)
-- [自动 SSL](#自动-SSL)
+  - [支持的 Docker 环境变量](#支持的-docker-环境变量)
+  - [支持的 Docker volume 属性](#支持的-docker-volume-属性)
+- [自动 SSL](#自动-ssl)
 - [自行构建镜像](#自行构建镜像)
-- [Docker Hub](#Docker-Hub)
-- [使用 Docker compose 来运行](#使用-Docker-compose-来运行)
+- [Docker Hub](#docker-hub)
+- [使用 Docker compose 来运行](#使用-docker-compose-来运行)
 - [常见问题](#常见问题)
 
 AriaNG
@@ -72,7 +73,7 @@ File Browser
   -v /yourdata:/data \
   -v /app/a.db:/app/filebrowser.db \
   -v /yoursslkeys/:/app/conf/key \
-  -v <to your aria2.conf>:/app/conf/aria2.conf \
+  -v <the folder of aria2.conf and aria2.session>:/app/conf \
   wahyd4/aria2-ui
 ```
 ### 使用docker-compose 运行
@@ -108,7 +109,7 @@ services:
 ### 支持的 Docker volume 属性
   * `/data` 用来放置所有下载的文件的目录
   * `/app/conf/key` 用户来放置 Aria2 SSL `certificate`证书和 `key` 文件. `注意`: 证书的名字必须是 `aria2.crt`， Key 文件的名字必须是 `aria2.key`
-  * `/app/conf/aria2.conf` 为 aria2 的配置文件，你可以映射自己的配置文件。
+  * `/app/conf` 该目录下可以放置你的自定义`aria2.conf`配置文件，`aria2.session`，且必须包含这两个文件。第一次使用`aria2.session`时，创建一个空文件即可，该文件会包含aria2当前的下载列表，这样即使容器被销毁也不用担心文件列表丢失了。你也可以直接拷贝当前项目下`conf`目录中的两个文件并使用。
   * `/app/filebrowser.db` File Browser 的内嵌数据库，升级Docker 镜像也不用担心之前的设置丢失。请确保在宿主机先创建一个空文件再使用。
 
 ## 自动 SSL
@@ -134,5 +135,6 @@ docker build -t aria2-ui .
   请参考 <https://github.com/wahyd4/aria2-ariang-x-docker-compose>
 
 ## 常见问题
-  1.当你以非其他`80` 端口或以启用了HTTPS`443`端口运行程序时，会出现`Aria2 状态 未连接`的错误，这是因为在最新版本里面，我们去掉aria2的独立6800端口，转而使用和网站同一个端口。因为你需要渠道 `AriaNg设置` -> 页面顶端的 `RPC`页面，将你的Aria2 RPC 地址中的端口从`80`改成你使用的正确端口。因为 AriaNg 仅仅将设置保存在浏览器中，因为当你使用不同的浏览器，或者将浏览器清除缓存后，你都需要重新设置一次。
-  1. 下载的BT或者磁力完全没有速度怎么办？ 建议先下载一个热门的BT种子文件，而不是磁力链接。这样可以帮助缓存DHT文件，渐渐地，速度就会起来了。比如试试下载树莓派操作系统的BT种子？[前往下载](https://www.raspberrypi.org/downloads/raspbian/)
+  1. 当你以非其他`80` 端口或以启用了HTTPS`443`端口运行程序时，会出现`Aria2 状态 未连接`的错误，这是因为在最新版本里面，我们去掉aria2的独立6800端口，转而使用和网站同一个端口。因为你需要渠道 `AriaNg设置` -> 页面顶端的 `RPC`页面，将你的Aria2 RPC 地址中的端口从`80`改成你使用的正确端口。因为 AriaNg 仅仅将设置保存在浏览器中，因为当你使用不同的浏览器，或者将浏览器清除缓存后，你都需要重新设置一次。
+  2. 下载的BT或者磁力完全没有速度怎么办？ 建议先下载一个热门的BT种子文件，而不是磁力链接。这样可以帮助缓存DHT文件，渐渐地，速度就会起来了。比如试试下载树莓派操作系统的BT种子？[前往下载](https://www.raspberrypi.org/downloads/raspbian/)
+  3. 如果你遇到了和 `setcap` 相关的错误，很大程度说明你说运行的Linux不支持使用非`root`用户来运行本Docker 镜像，因此请显式地设置环境变量`PUID`  `PGID` 为 `0` ，也就是使用`root` 来运行

README.md

@@ -4,22 +4,23 @@ 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/)
-[![Build Status](https://travis-ci.org/wahyd4/aria2-ariang-docker.svg?branch=master)](https://travis-ci.org/wahyd4/aria2-ariang-docker)
 [![Github Build](https://github.com/wahyd4/aria2-ariang-docker/workflows/Docker%20Image%20CI/badge.svg)](https://github.com/wahyd4/aria2-ariang-docker/actions)
 
-- [Features](#Features)
-- [Recommended versions](#Recommended-versions)
-- [How to run](#How-to-run)
-  - [Quick run](#Quick-run)
-  - [Full features run](#Full-features-run)
-  - [Run with docker-compose](#Run-with-docker-compose)
-  - [Supported Environment Variables](#Supported-Environment-Variables)
-  - [Supported Volumes](#Supported-Volumes)
-- [Auto SSL enabling](#Auto-SSL-enabling)
-- [Build the image by yourself](#Build-the-image-by-yourself)
-- [Docker Hub](#Docker-Hub)
-- [Usage it in Docker compose](#Usage-it-in-Docker-compose)
-- [FAQ](#FAQ)
+<img src="https://raw.githubusercontent.com/wahyd4/work-in-australia/766592ac6318027d7b3c334d8c50ca80818eeff8/wepay.jpg" alt="buy me a drink" width="120"/>
+
+- [Features](#features)
+- [Recommended versions](#recommended-versions)
+- [How to run](#how-to-run)
+  - [Quick run](#quick-run)
+  - [Full features run](#full-features-run)
+  - [Run with docker-compose](#run-with-docker-compose)
+  - [Supported Environment Variables](#supported-environment-variables)
+  - [Supported Volumes](#supported-volumes)
+- [Auto SSL enabling](#auto-ssl-enabling)
+- [Build the image by yourself](#build-the-image-by-yourself)
+- [Docker Hub](#docker-hub)
+- [Usage it in Docker compose](#usage-it-in-docker-compose)
+- [FAQ](#faq)
 
 One Docker image for all file downloading, managing, playing and evening sharing platforms!
 
@@ -78,7 +79,7 @@ File Browser
   -v /yourdata:/data \
   -v /app/a.db:/app/filebrowser.db \
   -v /yoursslkeys/:/app/conf/key \
-  -v <to your aria2.conf>:/app/conf/aria2.conf \
+  -v <the folder of aria2.conf and aria2.session>:/app/conf \
   wahyd4/aria2-ui
 ```
 ### Run with docker-compose
@@ -114,7 +115,7 @@ Then just run `docker-compose up -d`, that's it!
 ### Supported Volumes
   * `/data` The folder which contains all the files you download.
   * `/app/conf/key` The folder which stored 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/aria2.conf` The Aria2 configuration file.
+  * `/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.
   * `/app/filebrowser.db` File Browser settings database, make sure you make a empty file first on your host.
 
 ## Auto SSL enabling
@@ -141,3 +142,4 @@ docker build -t aria2-ui .
 ## FAQ
   1. When you running the docker image with non `80` port or you have HTTPS enabled, you will meet the error says `Aria2 Status Disconnected`, then you will need to go to `AriaNg Settings` -> RPC (at the top of the page) to modify the port value in `Aria2 RPC Address` field. Due to AriaNg store all configurations in local browser, so you need to do this per browser.
   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.

SecureCaddyfile

@@ -1,5 +1,5 @@
 {$DOMAIN} {
-  proxy / localhost:8080 {
+  proxy / file-manager {
       transparent
   }
 

arm32.Dockerfile

@@ -17,12 +17,7 @@ RUN adduser -D -u 1000 junv \
   && apk update \
   && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \
   && curl https://getcaddy.com | bash -s personal \
-  && filebrowser_version=v2.0.12 \
   && platform=linux-armv6 \
-  && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${platform}-filebrowser.tar.gz \
-  && tar -zxvf ${platform}-filebrowser.tar.gz \
-  && rm -rf ${platform}-filebrowser.tar.gz \
-  && rm LICENSE README.md \
   && wget -N https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-arm.tgz \
   && tar -zxvf forego-stable-linux-arm.tgz \
   && rm -rf forego-stable-linux-arm.tgz \

arm64.Dockerfile

@@ -1,54 +0,0 @@
-FROM arm64v8/alpine:3.8
-
-LABEL AUTHOR=Junv<wahyd4@gmail.com>
-
-WORKDIR /app
-
-ENV RPC_SECRET=""
-ENV ENABLE_AUTH=false
-ENV DOMAIN=0.0.0.0:80
-ENV ARIA2_USER=user
-ENV ARIA2_PWD=password
-ENV ARIA2_SSL=false
-ENV PUID=1000
-ENV PGID=1000
-
-RUN adduser -D -u 1000 junv \
-  && apk update \
-  && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \
-  && curl https://getcaddy.com | bash -s personal \
-  && filebrowser_version=v2.0.12 \
-  && platform=linux-arm64 \
-  && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${platform}-filebrowser.tar.gz \
-  && tar -zxvf ${platform}-filebrowser.tar.gz \
-  && rm -rf ${platform}-filebrowser.tar.gz \
-  && rm LICENSE README.md \
-  && wget -N https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-arm64.tgz \
-  && tar -zxvf forego-stable-linux-arm64.tgz \
-  && rm -rf forego-stable-linux-arm64.tgz \
-  && mkdir -p /usr/local/www \
-  && mkdir -p /usr/local/www/aria2
-
-ADD aria2c.sh caddy.sh Procfile init.sh start.sh /app/
-ADD conf /app/conf
-ADD Caddyfile SecureCaddyfile /usr/local/caddy/
-
-# AriaNg
-RUN mkdir /usr/local/www/aria2/Download \
-  && cd /usr/local/www/aria2 \
-  && chmod +rw /app/conf/aria2.session \
-  && version=1.1.1 \
-  && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/${version}/AriaNg-${version}.zip \
-  && unzip AriaNg-${version}.zip \
-  && rm -rf AriaNg-${version}.zip \
-  && chmod -R 755 /usr/local/www/aria2 \
-  && sed -i 's/6800/80/g' /usr/local/www/aria2/js/aria-ng*.js
-
-#The folder to store ssl keys
-VOLUME /app/conf/key
-# User downloaded files
-VOLUME /data
-
-EXPOSE 80 443
-
-CMD ["./start.sh"]

conf/aria2.conf

@@ -35,8 +35,8 @@ max-upload-limit=0
 #lowest-speed-limit=0
 #验证用，需要1.16.1之后的release版本
 #referer=*
-#文件保存路径, 默认为当前启动位置
-# dir=/user-files/superuser/
+
+# File downloading folder
 dir=/data
 #文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本
 #disk-cache=0
@@ -61,9 +61,7 @@ input-file=/app/conf/aria2.session
 # 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
 save-session=/app/conf/aria2.session
 # 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
-auto-session-interval=5
-# Save download with --save-session option even if the download is completed or removed. This option also saves control file in that situations. This may be useful to save BitTorrent seeding which is recognized as completed state.
-force-save=true
+save-session-interval=10
 
 # BT trackers from https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best_ip.txt
 bt-tracker=udp://62.138.0.158:6969/announce,udp://188.241.58.209:6969/announce,udp://188.241.58.209:6969/announce,udp://185.225.17.100:1337/announce,udp://62.210.79.110:1337/announce,udp://151.80.120.114:2710/announce,udp://151.80.120.112:2710/announce,udp://208.83.20.20:6969/announce,udp://176.113.68.67:8080/announce,udp://184.105.151.164:6969/announce,udp://176.113.68.66:6961/announce,http://176.113.71.19:6961/announce,udp://51.15.40.114:80/announce,udp://89.234.156.205:451/announce,udp://5.206.58.23:6969/announce,udp://176.31.106.35:80/announce,udp://188.246.227.212:80/announce,udp://5.2.79.219:1337/announce,udp://5.2.79.22:6969/announce,http://95.107.48.115:80/announce

init.sh

@@ -5,10 +5,10 @@ groupmod -o -g "$PGID" junv
 usermod -o -u "$PUID" junv
 
 chown -R junv:junv \
-         /data \
          /app \
          /usr/local \
-         /var/log
+         /var/log \
+         /data
 
 chmod +x /app/caddy.sh \
          /app/aria2c.sh

start.sh

@@ -1,3 +1,6 @@
 #!/bin/bash -eu
-
-$(dirname $0)/init.sh chpst -u junv ./forego start
+if [ "$PGID" != "0" ]; then
+  $(dirname $0)/init.sh chpst -u junv ./forego start
+else
+  ./forego start
+fi