Make WireGuard optional

This commit is contained in:
Manevolent 2021-09-21 15:54:46 -06:00
parent aa05a2d45b
commit 3a2d30419f
No known key found for this signature in database
GPG Key ID: 2E9B7592DFA4F344
3 changed files with 7 additions and 3 deletions

View File

@ -115,6 +115,10 @@ do
# Copy templates and dependencies to directory
mkdir docker/
cp -r ../docker/* docker/
if [ "${wg_enabled:-0}" -eq "1" ]; then
cp docker/services.opt/wireguard docker/services/wireguard
fi
cp -r $dir/docker/* docker/
cp ./../docker-compose.yml.tmpl .
cp ../Dockerfile.* .

View File

@ -1,4 +1,4 @@
{{ if eq "1" "${wg_enabled:-0}" }} image: ghcr.io/linuxserver/wireguard
image: ghcr.io/linuxserver/wireguard
container_name: wireguard
volumes:
- /etc/wireguard/${netname}:/config
@ -16,4 +16,4 @@
depends_on:
- tinc
sysctls:
- net.ipv4.conf.all.src_valid_mark=1{{ end }}
- net.ipv4.conf.all.src_valid_mark=1

View File

@ -49,4 +49,4 @@ touch /etc/lixonet/version
chmod 660 /etc/lixonet/version
stat /etc/lixonet/version
docker build -t lixonet-ee . && docker run --restart always -d -e DOCKER_HOST=unix:///var/run/docker.sock -e GIT_URL=$ORIGIN -v /var/run/docker.sock:/var/run/docker.sock -v /etc/bird:/etc/bird/ -v /etc/tinc:/etc/tinc -v /etc/bind:/etc/bind -v /etc/lixonet:/etc/lixonet -v /etc/lixonet/known_hosts:/home/lixonet/.ssh/known_hosts -v /etc/lixonet/id_rsa:/home/lixonet/.ssh/id_rsa lixonet-ee
docker build -t lixonet-ee . && docker run --restart always -d -e DOCKER_HOST=unix:///var/run/docker.sock -e GIT_URL=$ORIGIN -v /var/run/docker.sock:/var/run/docker.sock -v /etc/bird:/etc/bird/ -v /etc/tinc:/etc/tinc -v /etc/bind:/etc/bind -v /etc/lixonet:/etc/lixonet -v /etc/lixonet/known_hosts:/home/lixonet/.ssh/known_hosts -v /etc/lixonet/id_rsa:/home/lixonet/.ssh/id_rsa --name lixonet-ee lixonet-ee