diff --git a/Caddyfile b/Caddyfile index bcba986..5111493 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,6 +1,6 @@ {$DOMAIN} { - filebrowser / /data { - database /root/filebrowser.db + proxy / localhost:8080 { + transparent } log stdout errors stdout diff --git a/Dockerfile b/Dockerfile index e7ca5f2..7b2f2b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,21 +10,18 @@ ENV DOMAIN=0.0.0.0:80 ENV ARIA2_USER=user ENV ARIA2_PWD=password -# For build image in local quickly in China -# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories +RUN apk update \ + && apk add wget bash curl openrc gnupg screen aria2 tar --no-cache -RUN apk update && apk add wget bash curl openrc gnupg screen aria2 tar --no-cache - -RUN curl https://getcaddy.com | bash -s personal http.filebrowser - -ADD conf /root/conf -COPY aria2c.sh /root - -COPY Caddyfile SecureCaddyfile /usr/local/caddy/ +RUN curl https://getcaddy.com | bash -s personal +RUN curl -fsSL https://filebrowser.xyz/get.sh | bash RUN mkdir -p /usr/local/www && mkdir -p /usr/local/www/aria2 +ADD conf /root/conf +COPY aria2c.sh /root +COPY Caddyfile SecureCaddyfile /usr/local/caddy/ -#AriaNg +# AriaNg RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \ && chmod +rw /root/conf/aria2.session \ && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/1.0.0/AriaNg-1.0.0.zip && unzip AriaNg-1.0.0.zip && rm -rf AriaNg-1.0.0.zip \ diff --git a/aria2c.sh b/aria2c.sh index 0531abd..6e52910 100644 --- a/aria2c.sh +++ b/aria2c.sh @@ -17,13 +17,14 @@ echo "Start aria2 with secure config" --rpc-certificate=/root/conf/key/aria2.crt \ --rpc-private-key=/root/conf/key/aria2.key \ --rpc-secret="$RPC_SECRET" --rpc-secure \ -&& caddy -quic --conf ${CADDY_FILE} +&& (nohup sh -c /usr/local/bin/filebrowser -p 8000 -d /root/filebrowser.db -l /var/log/file-browser/out.log -r /data/ &)\ +&& /usr/local/bin/caddy -quic --conf ${CADDY_FILE} else + echo "Start aria2 with standard mode" /usr/bin/aria2c --conf-path="/root/conf/aria2.conf" -D \ --enable-rpc --rpc-listen-all \ -&& caddy -quic --conf ${CADDY_FILE} +&& (nohup sh -c /usr/local/bin/filebrowser -p 8000 -d /root/filebrowser.db -l /var/log/file-browser/out.log -r /data/ &)\ +&& /usr/local/bin/caddy -quic --conf ${CADDY_FILE} fi - -