From 531b6a1cbd3bdef7d4ce7d31ad1937ec0b32ff0a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Sep 2020 15:58:38 -0300
Subject: [PATCH] 1.8.0 - now runs with same uid/gid as Sutty

---
 Dockerfile | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d4a02d..0133a6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
-FROM sutty/daemonize:latest AS build
+FROM alpine:latest AS build
 MAINTAINER "f <f@sutty.nl>"
 
-ARG VERSION=1.3.2
+ARG VERSION=1.8.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
@@ -12,21 +13,18 @@ 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
 
-RUN echo /home/builder/packages/home > /etc/apk/repositories
-RUN apk add --no-cache daemonize
-
 FROM sutty/monit:latest
 
-COPY --from=build /usr/local/bin/syncthing /usr/local/bin/syncthing
-COPY --from=build /usr/local/bin/syncthing_start /usr/local/bin/syncthing_start
-COPY --from=build /usr/sbin/daemonize /usr/sbin/daemonize
+# Syncthing runs with the same uid and gid for Sutty so ownership is
+# kept, since ST doesn't sync these.
+RUN addgroup -g 82 -S syncthing
+RUN adduser -s /bin/sh -G www-data -D -u 1000 -h /home/syncthing syncthing
+
+RUN apk add --no-cache ca-certificates daemonize
+
 COPY ./monit.conf /etc/monit.d/syncthing.conf
-
-RUN addgroup -S syncthing
-RUN adduser -s /bin/sh -G syncthing -S -h /home/syncthing syncthing
-RUN monit -t
-
-RUN apk add --no-cache ca-certificates
+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