From 4b7e2a6707d2e57fdfd16d1cbf3a118059646cf1 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <w@qrk.us>
Date: Thu, 1 Apr 2021 14:18:37 -0400
Subject: [PATCH] use ziti-tunnel:latest container image tag; remove tun
 compose service

---
 ziti-tunnel/docker/docker-compose.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/ziti-tunnel/docker/docker-compose.yml b/ziti-tunnel/docker/docker-compose.yml
index 396f012fc..3555e67f0 100644
--- a/ziti-tunnel/docker/docker-compose.yml
+++ b/ziti-tunnel/docker/docker-compose.yml
@@ -1,13 +1,13 @@
 version: "3.3"
 services:
     ziti-test:
-        image: netfoundry/ziti-tunnel:0.18.2
+        image: netfoundry/ziti-tunnel:latest
         network_mode: host
         cap_add:
         - NET_ADMIN
         entrypoint: ["sh", "-c", "while true; do sleep 11; done"]
     ziti-tproxy:
-        image: netfoundry/ziti-tunnel:0.18.2
+        image: netfoundry/ziti-tunnel:latest
         network_mode: host
         cap_add:
         - NET_ADMIN
@@ -18,7 +18,7 @@ services:
         command: tproxy
 #        command: tproxy --resolver udp://127.0.0.123:53
     ziti-iproxy:
-        image: netfoundry/ziti-tunnel:0.18.2
+        image: netfoundry/ziti-tunnel:latest
         volumes:
         - .:/netfoundry
         network_mode: host
@@ -27,20 +27,8 @@ services:
         environment:
         - NF_REG_NAME
         command: tproxy --resolver none
-    ziti-tun:
-        image: netfoundry/ziti-tunnel:0.18.2
-        volumes:
-        - .:/netfoundry
-        network_mode: host
-        cap_add:
-        - NET_ADMIN
-        environment:
-        - NF_REG_NAME
-        command: tun
-        devices:
-        - "/dev/net/tun:/dev/net/tun"
     ziti-proxy:
-        image: netfoundry/ziti-tunnel:0.18.2
+        image: netfoundry/ziti-tunnel:latest
         volumes:
         - .:/netfoundry
         environment:
@@ -50,7 +38,7 @@ services:
         - "9999:9999"
         command: proxy "my example service":8888 "my other example service":9999
     ziti-host:
-        image: netfoundry/ziti-tunnel:0.18.2
+        image: netfoundry/ziti-tunnel:latest
         volumes:
         - .:/netfoundry
         environment: