Merge pull request #839 from gravitl/bugfix_v0.11.1_wireguard-tools

move wg to container

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

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

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

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

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

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

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/