From 6e50d5e3ae6291de1937145ed194a77f91824c79 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 8 Jun 2022 21:39:22 +0200
Subject: [PATCH] feat: merge init and wireguard containers
---
.gitlab-ci.yml | 9 ---------
init/Dockerfile | 3 ---
init/entrypoint.sh | 6 ------
wireguard/entrypoint.sh | 4 ++++
4 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 init/Dockerfile
delete mode 100755 init/entrypoint.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f6f3d8..0e5f474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,12 +16,3 @@ wireguard:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR/wireguard --dockerfile $CI_PROJECT_DIR/wireguard/Dockerfile --destination $CI_REGISTRY_IMAGE:wireguard-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:wireguard
-init:
- stage: build
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [ "" ]
- script:
- - mkdir -p /kaniko/.docker
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context $CI_PROJECT_DIR/init --dockerfile $CI_PROJECT_DIR/init/Dockerfile --destination $CI_REGISTRY_IMAGE:init-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:init
diff --git a/init/Dockerfile b/init/Dockerfile
deleted file mode 100644
index 76c19ad..0000000
--- a/init/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM alpine:3.15
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/init/entrypoint.sh b/init/entrypoint.sh
deleted file mode 100755
index f9cad26..0000000
--- a/init/entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-
-mkdir -p /dev/net
-mknod /dev/net/tun c 10 200
-chmod 0666 /dev/net/tun
diff --git a/wireguard/entrypoint.sh b/wireguard/entrypoint.sh
index af86aa6..f2c9223 100755
--- a/wireguard/entrypoint.sh
+++ b/wireguard/entrypoint.sh
@@ -8,6 +8,10 @@ if [ -n "$LOCAL_NETWORK" ]; then
echo interface="$interface"
fi
+mkdir -p /dev/net
+mknod /dev/net/tun c 10 200
+chmod 0666 /dev/net/tun
+
wg-quick up /wireguard.conf
if [ -n "$LOCAL_NETWORK" ]; then
--
GitLab