Merge remote-tracking branch 'origin/develop' into netclient_refactor_latest

Signed-off-by: Matthew R. Kasun <mkasun@nusak.ca>
This commit is contained in:
Matthew R. Kasun
2023-01-04 14:16:12 -05:00
153 changed files with 3971 additions and 407 deletions
+3 -6
View File
@@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.17.0
image: gravitl/netmaker:v0.17.1
cap_add:
- NET_ADMIN
- NET_RAW
@@ -49,7 +49,7 @@ services:
- "3478:3478/udp"
netmaker-ui:
container_name: netmaker-ui
image: gravitl/netmaker-ui:v0.17.0
image: gravitl/netmaker-ui:v0.17.1
depends_on:
- netmaker
links:
@@ -91,13 +91,10 @@ services:
- /root/wait.sh:/mosquitto/config/wait.sh
- mosquitto_data:/mosquitto/data
- mosquitto_logs:/mosquitto/log
ports:
- "1883:1883"
- "8883:8883"
volumes:
caddy_data: {}
caddy_conf: {}
sqldata: {}
dnsconfig: {}
mosquitto_data: {}
mosquitto_logs: {}
mosquitto_logs: {}