From 9f9212f0eab502027ff58ea2d1722aef60b4d143 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 18 Jul 2022 14:39:02 +0800
Subject: [PATCH] update aria2

---
 README.md                    |  2 +-
 aria2/Dockerfile             |  6 +++---
 aria2/README.md              |  4 ++--
 aria2/arm/Dockerfile         | 24 ------------------------
 aria2/arm/data/aria2.conf    | 11 -----------
 aria2/arm/docker-compose.yml | 19 -------------------
 6 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 aria2/arm/Dockerfile
 delete mode 100644 aria2/arm/data/aria2.conf
 delete mode 100644 aria2/arm/docker-compose.yml

diff --git a/README.md b/README.md
index 1788828..a3f789f 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ A collection of delicious docker recipes.
 - [x] alpine-arm :+1:
 - [x] apacheds
 - [x] aria2 :+1:
-- [x] ariang
+- [x] ariang :cn:
 - [x] cadvisor
 - [x] casperjs :+1:
 - [x] freegeoip
diff --git a/aria2/Dockerfile b/aria2/Dockerfile
index b769aae..957aea5 100644
--- a/aria2/Dockerfile
+++ b/aria2/Dockerfile
@@ -5,8 +5,6 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV TOKEN=00000000-0000-0000-0000-000000000000
-
 RUN set -xe \
     && apk add --no-cache aria2 \
     && aria2c https://github.com/tianon/gosu/releases/download/1.14/gosu-amd64 -o /usr/local/bin/gosu \
@@ -16,8 +14,10 @@ RUN set -xe \
 COPY ./data/aria2.conf /etc/aria2/
 VOLUME /data /etc/aria2
 WORKDIR /data
-
 EXPOSE 6800
+
+ENV TOKEN=00000000-0000-0000-0000-000000000000
+
 CMD set -xe \
     && chown -R aria2:aria2 /data \
     && gosu aria2 aria2c --conf-path=/etc/aria2/aria2.conf \
diff --git a/aria2/README.md b/aria2/README.md
index 11f2014..e90535d 100644
--- a/aria2/README.md
+++ b/aria2/README.md
@@ -71,8 +71,8 @@ $ ln -s /mnt/usb disk
 $ cd html
 $ curl -sSL https://github.com/binux/yaaw/archive/master.tar.gz | tar xz --strip 1
 ####################################################################################
-# wget https://github.com/mayswind/AriaNg/releases/download/1.2.2/AriaNg-1.2.2.zip #
-# unzip AriaNg-1.2.2.zip                                                           #
+# wget https://github.com/mayswind/AriaNg/releases/download/1.2.4/AriaNg-1.2.4.zip #
+# unzip AriaNg-1.2.4.zip                                                           #
 ####################################################################################
 $ vim docker-compose.yml
 $ docker-compose up -d
diff --git a/aria2/arm/Dockerfile b/aria2/arm/Dockerfile
deleted file mode 100644
index 33b8403..0000000
--- a/aria2/arm/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Dockerfile for aria2
-#
-
-FROM arm32v7/alpine:3
-MAINTAINER EasyPi Software Foundation
-
-ENV TOKEN=00000000-0000-0000-0000-000000000000
-
-RUN set -xe \
-    && apk add --no-cache aria2 \
-    && aria2c https://github.com/tianon/gosu/releases/download/1.14/gosu-armhf -o /usr/local/bin/gosu \
-    && chmod +x /usr/local/bin/gosu \
-    && adduser -D aria2
-
-COPY ./data/aria2.conf /etc/aria2/
-VOLUME /data /etc/aria2
-WORKDIR /data
-
-EXPOSE 6800
-CMD set -xe \
-    && chown -R aria2:aria2 /data \
-    && gosu aria2 aria2c --conf-path=/etc/aria2/aria2.conf \
-                         --rpc-secret=${TOKEN}
diff --git a/aria2/arm/data/aria2.conf b/aria2/arm/data/aria2.conf
deleted file mode 100644
index 15004a5..0000000
--- a/aria2/arm/data/aria2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-dir=/data
-disable-ipv6=true
-enable-rpc=true
-max-download-limit=0
-max-upload-limit=0
-rpc-allow-origin-all=true
-rpc-listen-all=true
-rpc-listen-port=6800
-rpc-secret=00000000-0000-0000-0000-000000000000
-seed-ratio=0
-seed-time=0
diff --git a/aria2/arm/docker-compose.yml b/aria2/arm/docker-compose.yml
deleted file mode 100644
index 95e87af..0000000
--- a/aria2/arm/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.8"
-
-services:
-
-  aria2:
-    image: easypi/aria2-arm
-    ports:
-      - "6800:6800"
-    volumes:
-      - ./data/disk:/data
-    environment:
-      - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db
-    restart: unless-stopped
-
-  webui:
-    image: easypi/ariang-arm
-    ports:
-      - "8080:80"
-    restart: unless-stopped