feat: S6 overlay (#2)

homecentr · Mar 13, 2020 · ea3dc56 · ea3dc56
1 parent e32ecc7
commit ea3dc56
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
-* text=auto
+* text=auto eol=lf
 *.sh eol=lf
diff --git a/Dockerfile b/Dockerfile
@@ -9,10 +9,24 @@ WORKDIR /go/src/github.com/homecentr/docker-swarm-local-network-connector
 RUN go get ./... && \
  go build
 
+FROM homecentr/base:1.1.0 as base
+
+LABEL maintainer="Lukas Holota <[email protected]>"
+
 FROM alpine:3.11.3
 
+# Install packages required by base
+RUN apk add --no-cache \
+ shadow=4.7-r1
+
+# Copy S6 overlay
+COPY --from=base / /
 COPY --from=build /go/src/github.com/homecentr/docker-swarm-local-network-connector/docker-swarm-local-network-connector /swarm-local-network-connector
 
+# Copy S6 overlay configuration
+COPY ./fs/ /
+
+# Make the binary executable
 RUN chmod a+x /swarm-local-network-connector
 
-ENTRYPOINT [ "/swarm-local-network-connector" ]
+ENTRYPOINT [ "/init" ]
diff --git a/fs/etc/services.d/connector/finish b/fs/etc/services.d/connector/finish
@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -S1
+
+s6-svscanctl -t /var/run/s6/services
diff --git a/fs/etc/services.d/connector/run b/fs/etc/services.d/connector/run
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv sh
+
+s6-setuidgid "$PUID:$PGID"
+
+exec /swarm-local-network-connector