diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..4cac86d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1 @@
+contrib/docker/Dockerfile
diff --git a/LICENSE b/LICENSE
index 53320c3..1182c20 100644
--- a/LICENSE
+++ b/LICENSE
@@ -17,11 +17,10 @@ statement from your version. This exception does not (and cannot) modify any
license terms which apply to the Application, with which you must still
comply.
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
new file mode 100644
index 0000000..a5174eb
--- /dev/null
+++ b/contrib/docker/Dockerfile
@@ -0,0 +1,18 @@
+FROM golang:stretch
+MAINTAINER Christer Waren/CWINFO "christer.waren@cwinfo.org"
+
+RUN apt-get update \
+ && apt-get upgrade -y
+
+ADD . /src
+
+WORKDIR /src
+
+RUN adduser --system --home /etc/yggdrasil-network --uid 1000 yggdrasil-network \
+ && rm -rf build_* && ./build \
+ && cp yggdrasil /usr/bin \
+ && cp contrib/docker/entrypoint.sh /
+
+VOLUME [ "/etc/yggdrasil-network" ]
+
+ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/contrib/docker/entrypoint.sh b/contrib/docker/entrypoint.sh
new file mode 100644
index 0000000..f1a9d3e
--- /dev/null
+++ b/contrib/docker/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+CONF_DIR="/etc/yggdrasil-network"
+
+if [ ! -f "$CONF_DIR/config.conf" ]; then
+ echo "generate $CONF_DIR/config.conf"
+ yggdrasil --genconf > "$CONF_DIR/config.conf"
+fi
+
+yggdrasil --useconf < "$CONF_DIR/config.conf"
+exit $?