add new option for kwmbridge dnat mode (#463)

* add new option for kwmbridge dnat mode
* add local config for test of nat functionality
* use variable instead of real ip
* move turn configuration to the right place
* update kwmbridge
* remove trivy

kwmbridge/Dockerfile

@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.1.2
+ARG CODE_VERSION=0.1.3
 FROM kopano/kwmbridged:${CODE_VERSION}
 
 ARG CODE_VERSION

kwmbridge/wrapper.sh

@@ -33,6 +33,16 @@ if [ -n "${ice_udp_port_range:-}" ]; then
 	set -- "$@" --use-ice-udp-port-range="$ice_udp_port_range"
 fi
 
+if [ -n "${use_nat_1to1_ips:-}" ]; then
+	for use_nat_1to1_ip in $use_nat_1to1_ips; do
+		set -- "$@" --use-nat-1to1-ip="$use_nat_1to1_ip"
+	done
+fi
+
+if [ -n "${use_nat_1to1_candidate_type:-}" ]; then
+	set -- "$@" --use-nat-1to1-candidate-type="$use_nat_1to1_candidate_type"
+fi
+
 if [ "${with_metrics:-}" = "yes" ]; then
 	set -- "$@" --with-metrics
 fi
@@ -48,13 +58,13 @@ fi
 if [ "${AUTOCONFIGURE}" = true ]; then
 	if [ "$INSECURE" = "yes" ]; then
 		dockerize \
-		-skip-tls-verify \
-		-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
-		-timeout 360s
+			-skip-tls-verify \
+			-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
+			-timeout 360s
 	else
 		dockerize \
-		-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
-		-timeout 360s
+			-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
+			-timeout 360s
 	fi
 
 	# services need to be aware of the machine-id