Update version

* Bump versions

* Try to fix build

.github/workflows/dockerimage.yml

@@ -50,7 +50,7 @@ jobs:
       uses: docker/setup-buildx-action@v1
     -
       name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache
       with:
         path: /tmp/.buildx-cache

APP_VERSION

@@ -1 +1 @@
-5.3.0
+6.1.2

Dockerfile

@@ -1,6 +1,6 @@
-FROM golang:alpine AS build-forego
+FROM golang AS build-forego
 
-RUN apk add --no-cache git openssh
+RUN apt update && apt install -y git
 
 WORKDIR /app
 
@@ -11,7 +11,7 @@ RUN git clone https://github.com/wahyd4/forego.git \
     && go build -o forego \
     && chmod +x forego
 
-FROM alpine:edge
+FROM debian:stable-slim
 
 LABEL AUTHOR=Junv<wahyd4@gmail.com>
 
@@ -34,6 +34,7 @@ ENV XDG_CONFIG_HOME=/app/.caddy/config
 ENV XDG_CACHE_HOME=/app/.cache
 ENV RCLONE_CONFIG_BASE64=""
 ENV ENABLE_APP_CHECKER=true
+ENV ENABLE_FILEBROWSER=true
 ENV CADDY_LOG_LEVEL=INFO
 ENV RCLONE_AUTO_UPLOAD_PROVIDER=
 ENV RCLONE_AUTO_UPLOAD_REMOTE_PATH=/downloads
@@ -41,7 +42,7 @@ ENV RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE=1K
 ENV RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE=100G
 ENV FIX_DATA_VOLUME_PERMISSIONS=false
 
-ADD install.sh aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/
+ADD install.sh aria2c.sh caddy.sh filebrowser.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/
 ADD conf /app/conf
 ADD Caddyfile SecureCaddyfile HerokuCaddyfile /usr/local/caddy/
 

Procfile

@@ -1,5 +1,5 @@
 caddy: /app/caddy.sh
-filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data -b /files
+filebrowser: /app/filebrowser.sh
 aria2c: /app/aria2c.sh
 rclone: /app/rclone.sh
 newer_version_checker: /app/new-version-checker.sh

README.md

@@ -68,12 +68,12 @@ File Browser
 ### Quick run
 
 ```shell
-  docker run -d --name aria2-ui -p 80:80 wahyd4/aria2-ui
+  docker run -d --name aria2-ui -p 8000:80 wahyd4/aria2-ui
 ```
 
-* Aria2: <http://yourip>
-* FileManger: <http://yourip/files>
-* Rclone: <http://yourip/rclone>
+* Aria2: <http://yourip:8000>
+* FileManger: <http://yourip:8000/files>
+* Rclone: <http://yourip:8000/rclone>
 * Please use `admin`/`admin` as username and password to login `Filebrowser` for the first time. And use `user`/`password` to login `Rclone` if you don't update `ARIA2_USER` and `ARIA2_PWD`
 
 ### Full features run
@@ -124,7 +124,8 @@ Then simply run `docker-compose up -d`, that's it!
 | ENV | Description|
 |:---|:---|
 | `ENABLE_AUTH` | Whether to enable Basic auth |
-| `ENABLE_RCLONE` | Whether to disable Rclone, if you running this container offline or do not have stable connection to Github, please set to `false`
+| `ENABLE_RCLONE` | Whether to disable Rclone, if you running this container offline or do not have stable connection to Github, please set to `false` |
+| `ENABLE_FILEBROWSER` | Whether to disable Filebrowser, set it to `false` to disable it, by default it's enabled |
 | `ARIA2_USER` | Basic Auth username, Rclone GUI uses it as well. |
 | `ARIA2_PWD` | Basic Auth password, Rclone GUI uses it as well. |
 | `ARIA2_EXTERNAL_PORT` | The Aria2 port which exposed to public to access to |

caddy.sh

@@ -9,15 +9,15 @@ case $ENABLE_AUTH in
 true)
   echo "[INFO] Use Basic Auth config file "
   export CADDY_FILE=/usr/local/caddy/SecureCaddyfile
-  sed -i 's/ARIA2_USER/'"${ARIA2_USER}"'/g' ${CADDY_FILE}
-  sed -i 's/ARIA2_PWD_ENCRYPT/'"${ARIA2_PWD_ENCRYPT}"'/g' ${CADDY_FILE}
+  sed -i "s#ARIA2_USER#${ARIA2_USER}#g" ${CADDY_FILE}
+  sed -i "s#ARIA2_PWD_ENCRYPT#${ARIA2_PWD_ENCRYPT}#g" ${CADDY_FILE}
   ;;
 
 heroku)
   echo "[INFO] Run Caddy with Heroku mode"
   export CADDY_FILE=/usr/local/caddy/HerokuCaddyfile
-  sed -i 's/ARIA2_USER/'"${ARIA2_USER}"'/g' ${CADDY_FILE}
-  sed -i 's/ARIA2_PWD_ENCRYPT/'"${ARIA2_PWD_ENCRYPT}"'/g' ${CADDY_FILE}
+  sed -i "s#ARIA2_USER#${ARIA2_USER}#g" ${CADDY_FILE}
+  sed -i "s#ARIA2_PWD_ENCRYPT#${ARIA2_PWD_ENCRYPT}#g" ${CADDY_FILE}
 
   sed -i 's/PORT/'"${PORT}"'/g' ${CADDY_FILE}
 

filebrowser.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+
+echo "Checking if FileBrowser is enabled..."
+
+if [ "$ENABLE_FILEBROWSER" = "true" ]; then
+    echo "Starting FileBrowser..."
+    /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data -b /files
+else
+    echo "FileBrowser is disabled. Set ENABLE_FILEBROWSER=true to enable it."
+fi

init.sh

@@ -24,7 +24,8 @@ fi
 
 chmod +x /app/caddy.sh \
          /app/rclone.sh \
-         /app/aria2c.sh
+         /app/aria2c.sh \
+         /app/filebrowser.sh
 
 echo "[INFO] Give caddy permissions to use low ports"
 setcap cap_net_bind_service=+ep /usr/local/bin/caddy

install.sh

@@ -2,10 +2,10 @@
 
 echo "[INFO] Set variables for $(arch)"
 
-caddy_version=2.6.4
-filebrowser_version=v2.23.0
-rclone_version=v1.62.2
-ariang_version=1.3.4
+caddy_version=2.9.1
+filebrowser_version=v2.32.0
+rclone_version=v1.69.1
+ariang_version=1.3.10
 
 case "$(arch)" in
 
@@ -34,10 +34,10 @@ 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 fuse vim libcap --no-cache \
+groupadd junv \
+  && useradd -g junv -m -s /bin/bash junv \
+  && apt update \
+  && apt install -y wget curl aria2 tar unzip libcap2-bin runit\
   && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_version}/${caddy_file} \
   && tar -zxf ${caddy_file} \
   && mv caddy /usr/local/bin/ \
@@ -65,6 +65,9 @@ adduser -D -u 1000 junv \
   && unzip ${ariang_file} \
   && rm -rf ${ariang_file} \
   && chmod -R 755 /usr/local/www/aria2 \
+  && mkdir -p /data && chown junv:junv /data \
   && mkdir -p /data/cloud \
   && chown junv:junv /data/cloud \
-  && ln -s /data/cloud /app
+  && ln -s /data/cloud /app \
+  && apt remove -y unzip\
+  && apt clean