diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f6f3d8a85feaa3b89ef4631ba205aba0571b351..0e5f47493fe3252d91192f7984a8255b67e6922b 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 76c19ad6da2e27f2a04907f617c52c6f43e757cd..0000000000000000000000000000000000000000 --- 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 f9cad2683d33704ad4e4956e8b356e4ed69b0fa5..0000000000000000000000000000000000000000 --- 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 af86aa6a48300dca835a89af82639107fb992d61..f2c922327752d1ffaacf84229371f21074b8d322 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