diff --git a/Dockerfile b/Dockerfile index 357fafc..a101890 100644 --- a/Dockerfile +++ b/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 diff --git a/install.sh b/install.sh index a515afa..1229f88 100755 --- a/install.sh +++ b/install.sh @@ -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 runit wget curl openrc gnupg aria2 tar mailcap fuse vim unzip libcap2-bin\ && 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,7 @@ 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