Rollback caddy to 2.0.0

.github/workflows/dockerimage.yml

@@ -9,7 +9,7 @@ on:
       - v*
 jobs:
   build:
-    if: github.event_name == 'release' || github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'wahyd4/aria2-ariang-docker'
+    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
@@ -53,18 +53,15 @@ jobs:
         docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Login to DockerHub
-      if: github.ref == 'refs/heads/master'
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PASS }}
     -
       name: Push docker images to Dockerhub
-      if: github.ref == 'refs/heads/master'
       run: |
         docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Inspect image
-      if: github.ref == 'refs/heads/master'
       run: |
         docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}

Dockerfile

@@ -24,6 +24,8 @@ ADD Caddyfile SecureCaddyfile /usr/local/caddy/
 
 RUN ./install.sh
 
+RUN rm ./install.sh
+
 # folder for storing ssl keys
 VOLUME /app/conf/key
 

README.CN.md

@@ -53,8 +53,8 @@ File Browser
 
 ### 快速运行
 
-```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

@@ -142,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.11.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_arm64.tar.gz \
-  && tar -zxvf caddy_*.tar.gz \
-  && mv caddy /usr/local/bin/ \
-  && rm -rf caddy_*.tar.gz \
-  && filebrowser_version=v2.11.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.3/rclone-v1.53.3-linux-arm64.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

@@ -2,7 +2,7 @@
 
 echo "Set variables for $(arch)"
 
-caddy_version=2.3.0
+caddy_version=2.0.0
 filebrowser_version=v2.11.0
 rclone_version=v1.53.3
 ariang_version=1.1.7
@@ -42,16 +42,16 @@ 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 -zxvf ${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 -zxvf ${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 -zxvf ${forego_file} \
+  && tar -zxf ${forego_file} \
   && rm -rf ${forego_file} \
   && mkdir -p /usr/local/www \
   && mkdir -p /usr/local/www/aria2 \
@@ -70,4 +70,4 @@ adduser -D -u 1000 junv \
   && 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
+  && chmod -R 755 /usr/local/www/aria2 \