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

move wg to container
This commit is contained in:
dcarns 2022-03-02 09:50:23 -05:00 committed by GitHub
commit b752f9e533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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/