From e7ebc2463e7efb35aa9508880e91acb941945388 Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Fri, 25 Feb 2022 18:04:42 -0500
Subject: [PATCH] move wg to container

---
 Dockerfile                           | 2 +-
 compose/docker-compose.contained.yml | 1 -
 compose/docker-compose.nocaddy.yml   | 1 -
 compose/docker-compose.nodns.yml     | 1 -
 compose/docker-compose.reference.yml | 1 -
 compose/docker-compose.yml           | 1 -
 docker/Dockerfile-netmaker-slim      | 2 +-
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e499b67a..39f380be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=${version}'"
 FROM alpine:3.14.3
 
 # add a c lib
-RUN apk add gcompat iptables
+RUN apk add gcompat iptables wireguard-tools
 # set the working directory
 WORKDIR /root/
 RUN mkdir -p /etc/netclient/config
diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index d10b93e8..551b9b04 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -6,7 +6,6 @@ services:
     image: gravitl/netmaker:v0.11.0
     volumes:
       - dnsconfig:/root/config/dnsconfig
-      - /usr/bin/wg:/usr/bin/wg
       - sqldata:/root/data
     cap_add: 
       - NET_ADMIN
diff --git a/compose/docker-compose.nocaddy.yml b/compose/docker-compose.nocaddy.yml
index 7dafe728..b86d598e 100644
--- a/compose/docker-compose.nocaddy.yml
+++ b/compose/docker-compose.nocaddy.yml
@@ -6,7 +6,6 @@ services:
     image: gravitl/netmaker:v0.11.0
     volumes:
       - dnsconfig:/root/config/dnsconfig
-      - /usr/bin/wg:/usr/bin/wg
       - sqldata:/root/data
     cap_add: 
       - NET_ADMIN
diff --git a/compose/docker-compose.nodns.yml b/compose/docker-compose.nodns.yml
index f079a708..6e63fc45 100644
--- a/compose/docker-compose.nodns.yml
+++ b/compose/docker-compose.nodns.yml
@@ -6,7 +6,6 @@ services:
     image: gravitl/netmaker:v0.11.0
     volumes:
       - dnsconfig:/root/config/dnsconfig
-      - /usr/bin/wg:/usr/bin/wg
       - sqldata:/root/data
     cap_add: 
       - NET_ADMIN
diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml
index 745ad416..2eb6bfde 100644
--- a/compose/docker-compose.reference.yml
+++ b/compose/docker-compose.reference.yml
@@ -5,7 +5,6 @@ services:
     image: gravitl/netmaker:v0.11.0
     volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS)
       - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
-      - /usr/bin/wg:/usr/bin/wg
       - sqldata:/root/data
     cap_add: # Necessary capabilities to set iptables when running in container
       - NET_ADMIN
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index d10b93e8..551b9b04 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -6,7 +6,6 @@ services:
     image: gravitl/netmaker:v0.11.0
     volumes:
       - dnsconfig:/root/config/dnsconfig
-      - /usr/bin/wg:/usr/bin/wg
       - sqldata:/root/data
     cap_add: 
       - NET_ADMIN
diff --git a/docker/Dockerfile-netmaker-slim b/docker/Dockerfile-netmaker-slim
index 8d915775..64e4394d 100644
--- a/docker/Dockerfile-netmaker-slim
+++ b/docker/Dockerfile-netmaker-slim
@@ -11,7 +11,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 /usr/local/go/bin/go build -ldflags="-
 
 FROM alpine:3.13.6
 # add a c lib
-RUN apk add gcompat iptables
+RUN apk add gcompat iptables wireguard-tools
 # set the working directory
 WORKDIR /root/