From 631690a78aceeac9f75f6f2775b237b5f3799d6a Mon Sep 17 00:00:00 2001
From: Junv Zhao <wahyd4@gmail.com>
Date: Fri, 15 Mar 2019 11:20:26 +0800
Subject: [PATCH] Restructure docker image

---
 .circleci/config.yml                       | 2 +-
 caddy/Caddyfile => Caddyfile               | 0
 caddy/Dockerfile => Dockerfile             | 0
 README.md                                  | 7 +++++++
 caddy/SecureCaddyfile => SecureCaddyfile   | 0
 caddy/aria2c.sh => aria2c.sh               | 0
 caddy/arm32.Dockerfile => arm32.Dockerfile | 0
 caddy/arm64.Dockerfile => arm64.Dockerfile | 0
 {caddy/conf => conf}/aria2.conf            | 0
 {caddy/conf => conf}/aria2.session         | 0
 {caddy/conf => conf}/key/aria2.crt         | 0
 {caddy/conf => conf}/key/aria2.key         | 0
 12 files changed, 8 insertions(+), 1 deletion(-)
 rename caddy/Caddyfile => Caddyfile (100%)
 rename caddy/Dockerfile => Dockerfile (100%)
 rename caddy/SecureCaddyfile => SecureCaddyfile (100%)
 rename caddy/aria2c.sh => aria2c.sh (100%)
 rename caddy/arm32.Dockerfile => arm32.Dockerfile (100%)
 rename caddy/arm64.Dockerfile => arm64.Dockerfile (100%)
 rename {caddy/conf => conf}/aria2.conf (100%)
 rename {caddy/conf => conf}/aria2.session (100%)
 rename {caddy/conf => conf}/key/aria2.crt (100%)
 rename {caddy/conf => conf}/key/aria2.key (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a8906c2..acd6080 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
       - checkout
       - run:
           name: Build latest
-          command: docker build -t wahyd4/aria2-ui:1.0.$CIRCLE_BUILD_NUM caddy/.
+          command: docker build -t wahyd4/aria2-ui:1.0.$CIRCLE_BUILD_NUM .
       - run:
           name: Push
           command: |
diff --git a/caddy/Caddyfile b/Caddyfile
similarity index 100%
rename from caddy/Caddyfile
rename to Caddyfile
diff --git a/caddy/Dockerfile b/Dockerfile
similarity index 100%
rename from caddy/Dockerfile
rename to Dockerfile
diff --git a/README.md b/README.md
index 16e6e30..f2e8819 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Aria2 + AriaNg
 <!-- TOC -->
 
 - [功能特性](#功能特性)
+- [推荐使用的docker image tag](#推荐使用的docker-image-tag)
 - [安装于运行](#安装于运行)
   - [快速运行](#快速运行)
   - [开启所有功能](#开启所有功能)
@@ -35,6 +36,12 @@ File Manager
   * 文件管理和视频播放 ([File Manager](https://henriquedias.com/filemanager/)，注意默认情况下，只能访问和管理 `/data` 目录下的文件)
   * 支持ARM CPU 架构，因此可以在树莓派中运行，请下载对应的[ARM TAG](https://cloud.docker.com/repository/docker/wahyd4/aria2-ui/tags) 版本, `arm32`或`arm64`
 
+## 推荐使用的docker image tag
+
+* latest
+* arm32
+* arm64
+
 ## 安装于运行
 
 ### 快速运行
diff --git a/caddy/SecureCaddyfile b/SecureCaddyfile
similarity index 100%
rename from caddy/SecureCaddyfile
rename to SecureCaddyfile
diff --git a/caddy/aria2c.sh b/aria2c.sh
similarity index 100%
rename from caddy/aria2c.sh
rename to aria2c.sh
diff --git a/caddy/arm32.Dockerfile b/arm32.Dockerfile
similarity index 100%
rename from caddy/arm32.Dockerfile
rename to arm32.Dockerfile
diff --git a/caddy/arm64.Dockerfile b/arm64.Dockerfile
similarity index 100%
rename from caddy/arm64.Dockerfile
rename to arm64.Dockerfile
diff --git a/caddy/conf/aria2.conf b/conf/aria2.conf
similarity index 100%
rename from caddy/conf/aria2.conf
rename to conf/aria2.conf
diff --git a/caddy/conf/aria2.session b/conf/aria2.session
similarity index 100%
rename from caddy/conf/aria2.session
rename to conf/aria2.session
diff --git a/caddy/conf/key/aria2.crt b/conf/key/aria2.crt
similarity index 100%
rename from caddy/conf/key/aria2.crt
rename to conf/key/aria2.crt
diff --git a/caddy/conf/key/aria2.key b/conf/key/aria2.key
similarity index 100%
rename from caddy/conf/key/aria2.key
rename to conf/key/aria2.key