diff --git a/Dockerfile b/Dockerfile index b5b5b45..a0f0686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,13 +37,13 @@ RUN adduser -D -u 1000 junv \ && mkdir -p /usr/local/www/aria2 \ && rm -rf init /app/*.txt \ && curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip \ - && unzip rclone-current-linux-amd64.zip \ - && cd rclone-*-linux-amd64 \ + && 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-current-linux-amd64.zip \ - && rm -rf /app/rclone-*-linux-amd64 + && 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 diff --git a/arm32.Dockerfile b/arm32.Dockerfile index 3ef73ba..58d329b 100644 --- a/arm32.Dockerfile +++ b/arm32.Dockerfile @@ -14,11 +14,16 @@ ENV ARIA2_EXTERNAL_PORT=80 ENV PUID=1000 ENV PGID=1000 ENV CADDYPATH=/app +ENV RCLONE_CONFIG=/app/conf/rclone/rclone.conf RUN adduser -D -u 1000 junv \ && apk update \ && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \ - && curl https://getcaddy.com | bash -s personal \ + && caddy_tag=v1.0.4 \ + && wget -N https://github.com/caddyserver/caddy/releases/download/${caddy_tag}/caddy_${caddy_tag}_linux_arm7.tar.gz \ + && tar -zxvf caddy_*.tar.gz \ + && mv caddy /usr/local/bin/ \ + && rm -rf caddy_*.tar.gz \ && filebrowser_version=v2.2.0 \ && platform=linux-armv6 \ && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${platform}-filebrowser.tar.gz \ @@ -29,9 +34,18 @@ RUN adduser -D -u 1000 junv \ && 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 + && mkdir -p /usr/local/www/aria2 \ + && rm -rf init /app/*.txt \ + && curl -O https://downloads.rclone.org/v1.53.0/rclone-v1.53.0-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 /app/ +ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh /app/ ADD conf /app/conf ADD Caddyfile SecureCaddyfile /usr/local/caddy/ diff --git a/arm64.Dockerfile b/arm64.Dockerfile index d17c07e..0d3c32c 100644 --- a/arm64.Dockerfile +++ b/arm64.Dockerfile @@ -18,7 +18,11 @@ ENV CADDYPATH=/app RUN adduser -D -u 1000 junv \ && apk update \ && apk add runit shadow wget bash curl openrc gnupg aria2 tar --no-cache \ - && curl https://getcaddy.com | bash -s personal \ + && caddy_tag=v1.0.4 \ + && wget -N https://github.com/caddyserver/caddy/releases/download/${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.2.0 \ && platform=linux-arm64 \ && wget -N https://github.com/filebrowser/filebrowser/releases/download/${filebrowser_version}/${platform}-filebrowser.tar.gz \ @@ -29,9 +33,18 @@ RUN adduser -D -u 1000 junv \ && 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 + && mkdir -p /usr/local/www/aria2 \ + && rm -rf init /app/*.txt \ + && curl -O https://downloads.rclone.org/v1.53.0/rclone-v1.53.0-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 /app/ +ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh /app/ ADD conf /app/conf ADD Caddyfile SecureCaddyfile /usr/local/caddy/