diff --git a/README.md b/README.md index c7639a63..1395749f 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ a platform for modern, blazing fast virtual networks - - + + @@ -48,7 +48,7 @@ a platform for modern, blazing fast virtual networks `wget -qO - https://raw.githubusercontent.com/gravitl/netmaker/master/scripts/nm-quick.sh | sudo bash` - + Upon completion, the logs will display the instructions to connect various devices. These can also be retrieved from the UI under "Access Keys." @@ -106,6 +106,9 @@ After installing Netmaker, check out the [Walkthrough](https://itnext.io/getting - [Terraform Provider](https://github.com/madacluster/netmaker-terraform-provider) +- [VyOS Integration](https://github.com/kylechase/vyos-netmaker) + +- [Netmaker K3S](https://github.com/geragcp/netmaker-k3s) ## Disclaimer [WireGuard](https://wireguard.com/) is a registered trademark of Jason A. Donenfeld. diff --git a/compose/docker-compose.hostnetwork.yml b/compose/docker-compose.hostnetwork.yml index 817356f4..17a4fea9 100644 --- a/compose/docker-compose.hostnetwork.yml +++ b/compose/docker-compose.hostnetwork.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.1 volumes: - dnsconfig:/root/config/dnsconfig - /usr/bin/wg:/usr/bin/wg @@ -38,7 +38,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.nodns.yml b/compose/docker-compose.nodns.yml index 0eff8c46..61cf8256 100644 --- a/compose/docker-compose.nodns.yml +++ b/compose/docker-compose.nodns.yml @@ -45,7 +45,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 497e329e..eb97fd19 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -35,11 +35,10 @@ services: MQ_HOST: "mq" HOST_NETWORK: "off" VERBOSITY: "1" - PORT_FORWARD_SERVICES: "dns" MANAGE_IPTABLES: "on" + PORT_FORWARD_SERVICES: "dns" ports: - "51821-51830:51821-51830/udp" - - "8081:8081" netmaker-ui: container_name: netmaker-ui depends_on: @@ -47,8 +46,6 @@ services: image: gravitl/netmaker-ui:v0.14.1 links: - "netmaker:api" - ports: - - "8082:80" environment: BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" restart: always @@ -65,7 +62,9 @@ services: image: caddy:latest container_name: caddy restart: unless-stopped - network_mode: host # Wants ports 80 and 443! + ports: + - "80:80" + - "443:443" volumes: - /root/Caddyfile:/etc/caddy/Caddyfile # - $PWD/site:/srv # you could also serve a static site in site folder @@ -78,7 +77,6 @@ services: container_name: mq restart: unless-stopped ports: - - "127.0.0.1:1883:1883" - "8883:8883" volumes: - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf