diff --git a/Dockerfile b/Dockerfile index 9cdfb1a..064370b 100644 --- a/Dockerfile +++ b/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 diff --git a/README.CN.md b/README.CN.md index 79d8cb3..976f345 100644 --- a/README.CN.md +++ b/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: diff --git a/README.md b/README.md index cea192a..b17e25c 100644 --- a/README.md +++ b/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 diff --git a/arm32.Dockerfile b/arm32.Dockerfile deleted file mode 100644 index a419978..0000000 --- a/arm32.Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM arm32v6/alpine:latest - -LABEL AUTHOR=Junv - -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"] diff --git a/arm64.Dockerfile b/arm64.Dockerfile deleted file mode 100644 index cf38e38..0000000 --- a/arm64.Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM arm64v8/alpine:latest - -LABEL AUTHOR=Junv - -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"] diff --git a/install.sh b/install.sh index ee8616d..57aeb6f 100755 --- a/install.sh +++ b/install.sh @@ -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 \