Reduce container image size

contrib/docker/Dockerfile

@@ -1,18 +1,22 @@
-FROM golang:stretch
+FROM docker.io/golang:alpine as builder
-MAINTAINER Christer Waren/CWINFO "christer.waren@cwinfo.org"
-
-RUN apt-get update \
-    && apt-get upgrade -y
-
-ADD . /src
 
+COPY . /src
 WORKDIR /src
+RUN apk add git && ./build 
 
-RUN adduser --system --home /etc/yggdrasil-network --uid 1000 yggdrasil-network \
+FROM docker.io/alpine
-    && rm -rf build_* && ./build \
+LABEL maintainer="Christer Waren/CWINFO <christer.waren@cwinfo.org>"
-    && cp yggdrasil /usr/bin \
+
-    && cp contrib/docker/entrypoint.sh /
+COPY --from=builder /src/yggdrasil /usr/bin/yggdrasil
+COPY --from=builder /src/yggdrasilctl /usr/bin/yggdrasilctl
+COPY contrib/docker/entrypoint.sh /usr/bin/entrypoint.sh
+
+# RUN addgroup -g 1000 -S yggdrasil-network \
+#  && adduser -u 1000 -S -g 1000 --home /etc/yggdrasil-network yggdrasil-network
+#
+# USER yggdrasil-network
+# TODO: Make running unprivileged work
 
 VOLUME [ "/etc/yggdrasil-network" ]
 
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/bin/entrypoint.sh" ]

contrib/docker/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 set -e