diff --git a/Dockerfile b/Dockerfile index f55391a..891cf18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,6 @@ FROM alpine:latest AS build MAINTAINER "f " -ARG VERSION=1.9.0 - -RUN apk add --no-cache binutils -RUN wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -RUN tar x -Of syncthing-linux-amd64-v${VERSION}.tar.gz syncthing-linux-amd64-v${VERSION}/syncthing \ - > /usr/local/bin/syncthing -RUN chmod +x /usr/local/bin/syncthing -RUN strip --strip-all /usr/local/bin/syncthing - COPY ./syncthing_start.sh /usr/local/bin/syncthing_start RUN chmod 755 /usr/local/bin/syncthing_start @@ -20,11 +11,10 @@ FROM sutty/monit:latest RUN addgroup -g 82 -S syncthing RUN adduser -s /bin/sh -G syncthing -D -u 1000 -h /home/syncthing syncthing -RUN apk add --no-cache ca-certificates daemonize +RUN apk add --no-cache ca-certificates daemonize syncthing COPY ./monit.conf /etc/monit.d/syncthing.conf COPY --from=build /usr/local/bin/syncthing_start /usr/local/bin/syncthing_start -COPY --from=build /usr/local/bin/syncthing /usr/local/bin/syncthing EXPOSE 22000 EXPOSE 22000/udp diff --git a/syncthing_start.sh b/syncthing_start.sh index 02be1dc..90a869f 100644 --- a/syncthing_start.sh +++ b/syncthing_start.sh @@ -10,4 +10,4 @@ install -dm 2750 -o syncthing -g syncthing ${dir}/Sync/.stfolder daemonize -p ${pid} -l ${pid} -u syncthing -c ${dir} \ -o ${log} -a -e ${log} \ - /usr/local/bin/syncthing -no-browser -gui-address='http://0.0.0.0:8443' + /usr/bin/syncthing -no-browser -gui-address='http://0.0.0.0:8443'