From 901333cc9929f5598634b2111ad423c76b03fcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Wed, 30 Jan 2019 13:12:46 +0200 Subject: [PATCH 1/2] Update Dockerfile --- contrib/docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index fb4fbfaa..baeb1f04 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,18 +1,21 @@ FROM docker.io/golang:alpine as builder -COPY . /src WORKDIR /src +RUN apk add git + +RUN git clone https://github.com/yggdrasil-network/yggdrasil-go.git . + ENV CGO_ENABLED=0 -RUN apk add git && ./build +RUN ./build FROM docker.io/alpine LABEL maintainer="Christer Waren/CWINFO " 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 +COPY --from=builder /src/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 From c2561c90c7d74d082eb291e8e7f0ed17d953242a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Mon, 11 Feb 2019 16:50:22 +0200 Subject: [PATCH 2/2] Update Dockerfile Making easier to install and update, because dont have to download Github repository manually. --- contrib/docker/Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index baeb1f04..a91f775d 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,16 +1,14 @@ -FROM docker.io/golang:alpine as builder +FROM golang:alpine as builder WORKDIR /src -RUN apk add git - -RUN git clone https://github.com/yggdrasil-network/yggdrasil-go.git . - ENV CGO_ENABLED=0 -RUN ./build +RUN apk add git && \ + git clone https://github.com/yggdrasil-network/yggdrasil-go.git . && \ + ./build -FROM docker.io/alpine +FROM alpine LABEL maintainer="Christer Waren/CWINFO " COPY --from=builder /src/yggdrasil /usr/bin/yggdrasil