From 8f4ff8f2a6a287b660b99ed34cf606232bdda2c2 Mon Sep 17 00:00:00 2001
From: Ken Bingham <w@qrk.us>
Date: Wed, 13 Jan 2021 14:48:15 -0500
Subject: [PATCH] add compose service for ziti-tunnel host (#265)

---
 ziti-tunnel/docker/Dockerfile         |  4 ++--
 ziti-tunnel/docker/docker-compose.yml | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ziti-tunnel/docker/Dockerfile b/ziti-tunnel/docker/Dockerfile
index 616b8fd7e..9249b15ef 100644
--- a/ziti-tunnel/docker/Dockerfile
+++ b/ziti-tunnel/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:stable-slim as fetch-ziti-artifacts
 # This build stage grabs artifacts that are copied into the final image.
 # It uses the same base as the final image to maximize docker cache hits.
 
-ARG ZITI_VERSION="0.15.3"
+ARG ZITI_VERSION="0.18.2"
 
 ARG ARTIFACTORY_TOKEN
 ARG ARTIFACTORY_BASE_URL="https://netfoundry.jfrog.io/netfoundry"
@@ -36,4 +36,4 @@ COPY ./docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh
 
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD [ "run" ]
\ No newline at end of file
+CMD [ "run" ]
diff --git a/ziti-tunnel/docker/docker-compose.yml b/ziti-tunnel/docker/docker-compose.yml
index 483b67301..396f012fc 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:tproxy
+        image: netfoundry/ziti-tunnel:0.18.2
         network_mode: host
         cap_add:
         - NET_ADMIN
         entrypoint: ["sh", "-c", "while true; do sleep 11; done"]
     ziti-tproxy:
-        image: netfoundry/ziti-tunnel:tproxy
+        image: netfoundry/ziti-tunnel:0.18.2
         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:tproxy
+        image: netfoundry/ziti-tunnel:0.18.2
         volumes:
         - .:/netfoundry
         network_mode: host
@@ -28,7 +28,7 @@ services:
         - NF_REG_NAME
         command: tproxy --resolver none
     ziti-tun:
-        image: netfoundry/ziti-tunnel:tun
+        image: netfoundry/ziti-tunnel:0.18.2
         volumes:
         - .:/netfoundry
         network_mode: host
@@ -40,7 +40,7 @@ services:
         devices:
         - "/dev/net/tun:/dev/net/tun"
     ziti-proxy:
-        image: netfoundry/ziti-tunnel:proxy
+        image: netfoundry/ziti-tunnel:0.18.2
         volumes:
         - .:/netfoundry
         environment:
@@ -49,3 +49,10 @@ services:
         - "8888:8888"
         - "9999:9999"
         command: proxy "my example service":8888 "my other example service":9999
+    ziti-host:
+        image: netfoundry/ziti-tunnel:0.18.2
+        volumes:
+        - .:/netfoundry
+        environment:
+        - NF_REG_NAME
+        command: host