From 8b7b3452cf6d6e480d87896de5520986fde8d272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 3 Dec 2018 05:57:00 +0200 Subject: [PATCH 1/5] Creating Dockerfile to /contrib/docker/ - Multiple architectures supported by using Golang's official Debian Stretch image. - Upgrading os to latest updates - Adding all files to image - Creating user for yggdrasil (kinda unused) - Building from source code --- contrib/docker/Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 contrib/docker/Dockerfile 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" ] From 80b876d21d1b8077e1fce2b23fd1eed8d587e6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 3 Dec 2018 05:58:24 +0200 Subject: [PATCH 2/5] Creating entrypoint.sh to /contrib/docker/ --- contrib/docker/entrypoint.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 contrib/docker/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 $? From 4fc0117e086750cf82ffb8c939e4e953b31e8daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 3 Dec 2018 06:06:58 +0200 Subject: [PATCH 3/5] Creating Dockerfile to / Hint for support of docker, same in cjdns repository --- Dockerfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4cac86d --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +contrib/docker/Dockerfile From ecc0cd499202c9254dd92d3d39117ad556a9e6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 3 Dec 2018 06:39:28 +0200 Subject: [PATCH 4/5] Update and rename LICENSE to LICENSE.md --- LICENSE => LICENSE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename LICENSE => LICENSE.md (99%) diff --git a/LICENSE b/LICENSE.md similarity index 99% rename from LICENSE rename to LICENSE.md index 53320c3..1182c20 100644 --- a/LICENSE +++ b/LICENSE.md @@ -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. From 6170f7268f2c5a4c009144b6ad5d0fb84baad0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 3 Dec 2018 06:46:05 +0200 Subject: [PATCH 5/5] Rename LICENSE.md to LICENSE --- LICENSE.md => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.md => LICENSE (100%) diff --git a/LICENSE.md b/LICENSE similarity index 100% rename from LICENSE.md rename to LICENSE