From ed569e45784efca397d42ec4dec639bea05deec4 Mon Sep 17 00:00:00 2001 From: Yan Minari Date: Thu, 18 Jul 2019 17:48:04 -0300 Subject: [PATCH] CI: Fix dockerfiles Signed-off-by: Yan Minari --- contrib/docker/alpine/entrypoint.sh | 2 ++ contrib/docker/ci/alpine/Dockerfile | 2 +- contrib/docker/ci/scratch/Dockerfile | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/docker/alpine/entrypoint.sh b/contrib/docker/alpine/entrypoint.sh index 26c685a8..69c7eabc 100755 --- a/contrib/docker/alpine/entrypoint.sh +++ b/contrib/docker/alpine/entrypoint.sh @@ -4,6 +4,8 @@ set -e CONF_DIR="/etc/yggdrasil-network" +mkdir -p $CONF_DIR + if [ ! -f "$CONF_DIR/config.conf" ]; then echo "generate $CONF_DIR/config.conf" yggdrasil --genconf > "$CONF_DIR/config.conf" diff --git a/contrib/docker/ci/alpine/Dockerfile b/contrib/docker/ci/alpine/Dockerfile index edad2323..43b65324 100644 --- a/contrib/docker/ci/alpine/Dockerfile +++ b/contrib/docker/ci/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine -ARG BUILDPLATFORM +ARG TARGETPLATFORM ENV TARGETPLATFORM=$TARGETPLATFORM COPY ${TARGETPLATFORM}/* /usr/bin/ diff --git a/contrib/docker/ci/scratch/Dockerfile b/contrib/docker/ci/scratch/Dockerfile index 5db58875..1b8cbd68 100644 --- a/contrib/docker/ci/scratch/Dockerfile +++ b/contrib/docker/ci/scratch/Dockerfile @@ -3,7 +3,9 @@ FROM scratch ENV XDG_RUNTIME_DIR / ENV XDG_CONFIG_DIRS / -COPY yggdrasil / -COPY yggdrasilctl / +ARG TARGETPLATFORM +ENV TARGETPLATFORM=$TARGETPLATFORM + +COPY ${TARGETPLATFORM}/* / ENTRYPOINT ["/yggdrasil"]