Rollback caddy to 2.0.0

update the rclone arm64 based download url

.github/workflows/dockerimage.yml

@@ -1,14 +1,67 @@
-name: Docker Image CI
-on: [push]
+name: Build and Push docker image
+on:
+  pull_request:
+    branches: master
+  push:
+    branches:
+      - '*'
+    tags:
+      - v*
 jobs:
   build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'wahyd4/aria2-ariang-docker'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Build and Publish main docker image to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+    -
+      name: Prepare
+      id: prepare
+      run: |
+        DOCKER_IMAGE=wahyd4/aria2-ui
+        DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+        VERSION=edge
+
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/v}
+        fi
+        TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
+        if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+          TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
+        fi
+
+        echo ::set-output name=docker_image::${DOCKER_IMAGE}
+        echo ::set-output name=version::${VERSION}
+        echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+          --build-arg VERSION=${VERSION} \
+          --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+          --build-arg VCS_REF=${GITHUB_SHA::8} \
+          ${TAGS} --file Dockerfile .
+    - name: Set up Docker Buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
+    -
+      name: Cache Docker layers
+      uses: actions/cache@v2
+      id: cache
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
+    -
+      name: Docker Buildx (build)
+      run: |
+        docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+    -
+      name: Login to DockerHub
+      uses: docker/login-action@v1
       with:
-        name: wahyd4/aria2-ui
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PASS }}
-        snapshot: true
+    -
+      name: Push docker images to Dockerhub
+      run: |
+        docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+    -
+      name: Inspect image
+      run: |
+        docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}

.github/workflows/image-vulnability.yml

@@ -1,15 +1,23 @@
 name: Docker Image Vulnability Check
-on: [push]
+on:
+  pull_request:
+    branches: master
+  push:
+    branches:
+      - '*'
 jobs:
   build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'wahyd4/aria2-ariang-docker'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag local/aria-ui:latest
     - name: Scan image
-      uses: anchore/scan-action@v1
+      uses: anchore/scan-action@v2
       with:
-        image-reference: "local/aria-ui:latest"
+        image: "local/aria-ui:latest"
         fail-build: true
         severity-cutoff: high
+    - name: grype scan JSON results
+      run: for j in `ls ./anchore-reports/*.json`; do echo "---- ${j} ----"; cat ${j}; echo; done

Dockerfile

@@ -18,46 +18,13 @@ ENV RCLONE_CONFIG=/app/conf/rclone.conf
 ENV XDG_DATA_HOME=/app/.caddy/data
 ENV XDG_CONFIG_HOME=/app/.caddy/config
 
-ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh /app/
+ADD install.sh aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh /app/
 ADD conf /app/conf
 ADD Caddyfile SecureCaddyfile /usr/local/caddy/
 
-RUN adduser -D -u 1000 junv \
-  && apk update \
-  && apk add runit shadow wget bash curl openrc gnupg aria2 tar mailcap --no-cache \
-  && caddy_tag=2.2.1 \
-  && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_tag}/caddy_${caddy_tag}_linux_amd64.tar.gz \
-  && tar -zxvf caddy_${caddy_tag}_linux_amd64.tar.gz \
-  && mv caddy /usr/local/bin/ \
-  && rm -rf caddy_${caddy_tag}_linux_amd64.tar.gz \
-  && filebrowser_version=v2.7.0 \
-  && 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 CHANGELOG.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 \
-  && mkdir -p /usr/local/www \
-  && mkdir -p /usr/local/www/aria2 \
-  && rm -rf init /app/*.txt \
-  && curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip \
-  && unzip rclone-*.zip \
-  && cd rclone-*-linux-amd64 \
-  && cp rclone /usr/local/bin/ \
-  && chown junv:junv /usr/local/bin/rclone \
-  && chmod 755 /usr/local/bin/rclone \
-  && rm /app/rclone-*.zip \
-  && rm -rf /app/rclone-* \
-  && mkdir /usr/local/www/aria2/Download \
-  && cd /usr/local/www/aria2 \
-  && chmod +rw /app/conf/aria2.session \
-  && version=1.1.7 \
-  && 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
+RUN ./install.sh
+
+RUN rm ./install.sh
 
 # folder for storing ssl keys
 VOLUME /app/conf/key

README.CN.md

@@ -14,7 +14,7 @@ Aria2 + AriaNg
 
 - [功能特性](#功能特性)
 - [推荐使用的docker image tag](#推荐使用的docker-image-tag)
-- [安装于运行](#安装于运行)
+- [安装与运行](#安装与运行)
   - [快速运行](#快速运行)
   - [开启所有功能](#开启所有功能)
   - [使用docker-compose 运行](#使用docker-compose-运行)
@@ -41,22 +41,20 @@ File Browser
   * 支持绑定自定义用户ID，可以主机上的非`root`用户，也可以管理下载的文件
   * Basic Auth 用户认证
   * 文件管理和视频播放 ([File Browser](https://filebrowser.xyz/)，注意默认情况下，只能访问和管理 `/data` 目录下的文件)
-  * 支持ARM CPU 架构，因此可以在树莓派中运行，请下载对应的[ARM TAG](https://cloud.docker.com/repository/docker/wahyd4/aria2-ui/tags) 版本, `arm32`或`arm64`
+  * 支持ARM CPU 架构，因此可以在树莓派等设备上运行，
 
 ## 推荐使用的docker image tag
 
 * wahyd4/aria2-ui:latest
-* wahyd4/aria2-ui:arm32
-* wahyd4/aria2-ui:arm64
 
-> ‼️ 如果你在莓派上运行本程序，请使用 `arm32` 版本
+> Docker会为你自动选择对应CPU平台的image. e.g. arm64v8 或者 x86_64 平台
 
-## 安装于运行
+## 安装与运行
 
 ### 快速运行
 
-```shell
-  docker run -d --name aria2-ui -p 80:80 wahyd4/aria2-ui
+```bash
+  docker buildx build --platform linux/arm/v7,linux/arm64,linux/amd64 -t aria2-ui .
 ```
 
 * Aria2: <http://yourip/ui/>

README.md

@@ -27,7 +27,7 @@ English | [简体中文](https://github.com/wahyd4/aria2-ariang-docker/blob/mast
 
 One Docker image for file downloading, managing, sharing, as well as video playing and evening cloud storage synchronization.
 
-Furthermore, it's pretty small and ARM CPU compatible which means you can also run it on Raspberry Pi🍓. (**with proper arm docker image tag**)
+Furthermore, it's pretty small and ARM CPU compatible which means you can also run it on Raspberry Pi🍓.
 
 Last but not least, Auto HTTPS can't be more easy!
 
@@ -52,10 +52,8 @@ File Browser
 ## Recommended versions
 
 * wahyd4/aria2-ui:latest
-* wahyd4/aria2-ui:arm32
-* wahyd4/aria2-ui:arm64
 
-> ‼️ If you plan to run this docker image on Raspberry Pi，please use tag `arm32`
+> Docker will pick the the proper ARCH for you. e.g. arm64v8 or x86_64
 
 ## How to run
 
@@ -144,8 +142,8 @@ docker run -d --name aria2-ui -p 80:80 -p 443:443 -e DOMAIN=https://toozhao.com
 ```
 ## Build the image by yourself
 
-```
-docker build -t aria2-ui .
+```bash
+ docker buildx build --platform linux/arm/v7,linux/arm64,linux/amd64 -t aria2-ui .
 ```
 
 ## Docker Hub

arm32.Dockerfile

@@ -1,72 +0,0 @@
-FROM arm32v6/alpine:latest
-
-LABEL AUTHOR=Junv<wahyd4@gmail.com>
-
-WORKDIR /app
-
-ENV RPC_SECRET=""
-ENV ENABLE_AUTH=false
-ENV DOMAIN=http://localhost
-ENV ARIA2_USER=user
-ENV ARIA2_PWD=password
-ENV ARIA2_SSL=false
-ENV ARIA2_EXTERNAL_PORT=80
-ENV PUID=1000
-ENV PGID=1000
-ENV CADDYPATH=/app
-ENV RCLONE_CONFIG=/app/conf/rclone.conf
-ENV XDG_DATA_HOME=/app/.caddy/data
-ENV XDG_CONFIG_HOME=/app/.caddy/config
-
-RUN adduser -D -u 1000 junv \
-  && apk update \
-  && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \
-  && caddy_tag=2.2.1 \
-  && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_tag}/caddy_${caddy_tag}_linux_amd64.tar.gz \
-  && tar -zxvf caddy_*.tar.gz \
-  && mv caddy /usr/local/bin/ \
-  && rm -rf caddy_*.tar.gz \
-  && filebrowser_version=v2.7.0 \
-  && 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 \
-  && mkdir -p /usr/local/www \
-  && mkdir -p /usr/local/www/aria2 \
-  && rm -rf init /app/*.txt \
-  && curl -O https://downloads.rclone.org/v1.53.1/rclone-v1.53.1-linux-arm.zip \
-  && unzip rclone-*.zip \
-  && cd rclone-* \
-  && cp rclone /usr/local/bin/ \
-  && chown junv:junv /usr/local/bin/rclone \
-  && chmod 755 /usr/local/bin/rclone \
-  && rm /app/rclone-*.zip \
-  && rm -rf /app/rclone-*
-
-ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.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.6 \
-  && 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
-
-#The folder to store ssl keys
-VOLUME /app/conf/key
-# User downloaded files
-VOLUME /data
-
-EXPOSE 80 443
-
-CMD ["./start.sh"]

arm64.Dockerfile

@@ -1,71 +0,0 @@
-FROM arm64v8/alpine:latest
-
-LABEL AUTHOR=Junv<wahyd4@gmail.com>
-
-WORKDIR /app
-
-ENV RPC_SECRET=""
-ENV ENABLE_AUTH=false
-ENV DOMAIN=http://localhost
-ENV ARIA2_USER=user
-ENV ARIA2_PWD=password
-ENV ARIA2_SSL=false
-ENV ARIA2_EXTERNAL_PORT=80
-ENV PUID=1000
-ENV PGID=1000
-ENV CADDYPATH=/app
-ENV RCLONE_CONFIG=/app/conf/rclone.conf
-ENV XDG_DATA_HOME=/app/.caddy/data
-ENV XDG_CONFIG_HOME=/app/.caddy/config
-
-RUN adduser -D -u 1000 junv \
-  && apk update \
-  && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \
-  && caddy_tag=2.2.1 \
-  && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_tag}/caddy_${caddy_tag}_linux_amd64.tar.gz \
-  && tar -zxvf caddy_*.tar.gz \
-  && mv caddy /usr/local/bin/ \
-  && rm -rf caddy_*.tar.gz \
-  && filebrowser_version=v2.7.0 \
-  && 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 \
-  && rm -rf init /app/*.txt \
-  && curl -O https://downloads.rclone.org/v1.53.1/rclone-v1.53.1-linux-arm.zip \
-  && unzip rclone-*.zip \
-  && cd rclone-* \
-  && cp rclone /usr/local/bin/ \
-  && chown junv:junv /usr/local/bin/rclone \
-  && chmod 755 /usr/local/bin/rclone \
-  && rm /app/rclone-*.zip \
-  && rm -rf /app/rclone-*
-
-ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.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.6 \
-  && 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
-
-#The folder to store ssl keys
-VOLUME /app/conf/key
-# User downloaded files
-VOLUME /data
-
-EXPOSE 80 443
-
-CMD ["./start.sh"]

install.sh

@@ -0,0 +1,73 @@
+#! /bin/sh -eux
+
+echo "Set variables for $(arch)"
+
+caddy_version=2.0.0
+filebrowser_version=v2.11.0
+rclone_version=v1.53.3
+ariang_version=1.1.7
+
+case "$(arch)" in
+
+   x86_64)
+      platform=linux-amd64
+      caddy_file=caddy_${caddy_version}_linux_amd64.tar.gz
+      rclone_file=rclone-${rclone_version}-${platform}.zip
+      forego_file=forego-stable-${platform}.tgz
+     ;;
+   armv7l)
+     platform=linux-armv7
+     caddy_file=caddy_${caddy_version}_linux_armv7.tar.gz
+     rclone_file=rclone-${rclone_version}-linux-arm-v7.zip
+     forego_file=forego-stable-linux-arm.tgz
+     ;;
+
+   aarch64)
+     platform=linux-arm64
+     caddy_file=caddy_${caddy_version}_linux_arm64.tar.gz
+     rclone_file=rclone-${rclone_version}-${platform}.zip
+     forego_file=forego-stable-${platform}.tgz
+     ;;
+
+   *)
+     echo "unsupported arch $(arch), exit now"
+     exit 1
+     ;;
+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 --no-cache \
+  && 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} \
+  && platform=linux-amd64 \
+  && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${filebrowser_file} \
+  && tar -zxf ${filebrowser_file} \
+  && rm -rf ${filebrowser_file} \
+  && rm LICENSE README.md CHANGELOG.md \
+  && wget -N https://bin.equinox.io/c/ekMN3bCZFUn/${forego_file} \
+  && tar -zxf ${forego_file} \
+  && rm -rf ${forego_file} \
+  && mkdir -p /usr/local/www \
+  && mkdir -p /usr/local/www/aria2 \
+  && rm -rf init /app/*.txt \
+  && curl -O https://downloads.rclone.org/${rclone_version}/${rclone_file} \
+  && unzip ${rclone_file} \
+  && cd rclone-* \
+  && cp rclone /usr/local/bin/ \
+  && chown junv:junv /usr/local/bin/rclone \
+  && chmod 755 /usr/local/bin/rclone \
+  && rm /app/${rclone_file} \
+  && rm -rf /app/rclone-* \
+  && mkdir /usr/local/www/aria2/Download \
+  && cd /usr/local/www/aria2 \
+  && chmod +rw /app/conf/aria2.session \
+  && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/${ariang_version}/${ariang_file} \
+  && unzip ${ariang_file} \
+  && rm -rf ${ariang_file} \
+  && chmod -R 755 /usr/local/www/aria2 \