diff --git a/Dockerfile b/Dockerfile index 6915609..f85458f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,8 +110,14 @@ RUN apt update && apt upgrade -y && \ asdf plugin add golang && \ asdf install golang latest && \ asdf global golang $(asdf latest golang) && \ - go get -u github.com/zhaojh329/rttys && \ - cp ~/.asdf/installs/golang/$(asdf latest golang)/packages/bin/rttys /usr/local/bin/ && \ + curl -fsSL https://deb.nodesource.com/setup_current.x | bash - && \ + apt install -y nodejs && \ + cd /opt/rtty_build/rttys/frontend && \ + npm install && \ + npm run build && \ + cd /opt/rtty_build/rttys && \ + ./build.sh linux ${ARCH} && \ + cp rttys-linux*/rttys /usr/local/bin/rttys && \ cd /opt && \ echo "**** dashboard related ****" && \ apt install -y lighttpd && \ @@ -122,7 +128,7 @@ RUN apt update && apt upgrade -y && \ echo "**** rclone ****" && \ curl https://rclone.org/install.sh | bash && \ echo "**** filebrowser ****" && \ - curl -fsSL https://filebrowser.org/get.sh | bash && \ + curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash && \ echo "**** ansible ****" && \ apt install -y python3-apt sshpass ansible ansible-lint ansible-doc && \ echo "**** misc ****" && \ diff --git a/root/etc/services.d/rttys/run b/root/etc/services.d/rttys/run old mode 100755 new mode 100644 index 59ac0d6..b9b4845 --- a/root/etc/services.d/rttys/run +++ b/root/etc/services.d/rttys/run @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bash - -/usr/local/bin/rttys \ - -conf /opt/rtty/rttys.conf +/usr/local/bin/rttys run \ + --conf /opt/rtty/rttys.conf \ + --log /opt/rtty/rttys.log