From 2c55261d0523d4540b57ebf297c8dfdd0bdd6bde Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Fri, 23 Apr 2021 13:20:58 -0400
Subject: [PATCH] move from netfoundry to openziti

---
 quickstart/docker/docker-compose.yml        | 11 +++++------
 quickstart/docker/image/Dockerfile          |  6 +++---
 quickstart/docker/image/env.sh              | 10 +++++-----
 quickstart/local/express/express-dev-env.sh |  1 -
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml
index 8df656d42..56c3689ae 100644
--- a/quickstart/docker/docker-compose.yml
+++ b/quickstart/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   ziti-controller:
-    image: netfoundry/ziti-quickstart
+    image: openziti/ziti-quickstart
     build: ./image
     ports:
       - 1280:1280
@@ -11,12 +11,12 @@ services:
           - ziti-controller
           - ziti-edge-controller
     volumes:
-      - ziti-fs:/netfoundry
+      - ziti-fs:/openziti
     entrypoint:
       - /home/ziti/run-controller.sh
 
   ziti-edge-router:
-    image: netfoundry/ziti-quickstart
+    image: openziti/ziti-quickstart
     depends_on:
       ziti-controller:
         condition: service_started
@@ -26,12 +26,11 @@ services:
       ziticontrol:
         aliases:
           - ziti-edge-router
+    volumes:
+      - ziti-fs:/openziti
     entrypoint:
       - /home/ziti/run-edge-router.sh
-
     #command: ["wait-for-it", "ziti-controller:1280", "-t", "120", "--", "./run-edge-router.sh"]
-    volumes:
-      - ziti-fs:/netfoundry
 
 networks:
   ziticontrol:
diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile
index 3808eb819..dabe60cb1 100644
--- a/quickstart/docker/image/Dockerfile
+++ b/quickstart/docker/image/Dockerfile
@@ -4,8 +4,8 @@ RUN apt update && \
     apt install jq dos2unix curl netcat-openbsd wait-for-it vim inetutils-ping net-tools -y
 
 RUN useradd -ms /bin/bash ziti && \
-    mkdir /netfoundry && \
-    chown ziti:ziti /netfoundry
+    mkdir /openziti && \
+    chown ziti:ziti /openziti
 
 USER ziti
 WORKDIR /home/ziti
@@ -14,7 +14,7 @@ WORKDIR /home/ziti
 COPY --chown=ziti ziti.ignore /usr/local/bin/
 COPY --chown=ziti *.sh ./
 
-RUN export ENV_FILE=/home/ziti/ziti.env && \
+RUN export ZITI_HOME=/openziti && \
     export ZITI_CONTROLLER_RAWNAME=ziti-controller && \
     export ZITI_EDGE_CONTROLLER_RAWNAME=ziti-edge-controller && \
     export ZITI_EDGE_ROUTER_RAWNAME=ziti-edge-router && \
diff --git a/quickstart/docker/image/env.sh b/quickstart/docker/image/env.sh
index 898b1cf86..11170da06 100755
--- a/quickstart/docker/image/env.sh
+++ b/quickstart/docker/image/env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-if [[ "${ENV_FILE}" == "" ]]; then
-  echo "ERROR: ENV_FILE HAS NOT BEEN DECLARED!"
+if [[ "${ZITI_HOME}" == "" ]]; then
+  echo "ERROR: ZITI_HOME HAS NOT BEEN DECLARED!"
   exit 1
 fi
 if [[ "${network_name}" != "" ]]; then
@@ -12,11 +12,11 @@ fi
 if [[ "${ZITI_NETWORK}" = "" ]]; then
   export ZITI_NETWORK=$(hostname)
 fi
-# make the quickstart home folder where all the config files, logs, etc will go
-export ZITI_HOME=${HOME}/.ziti/quickstart/${ZITI_NETWORK}
+
+export ENV_FILE="${ZITI_HOME}/${ZITI_NETWORK}.env"
 export ZITI_USER="admin"
 export ZITI_PWD="admin"
-export ZITI_DOMAIN_SUFFIX=".ziti.netfoundry.io"
+export ZITI_DOMAIN_SUFFIX=".openziti.org"
 export ZITI_DOMAIN_SUFFIX=""
 export ZITI_ID="${ZITI_HOME}/identities.yml"
 export ZITI_FAB_MGMT_PORT="10000"
diff --git a/quickstart/local/express/express-dev-env.sh b/quickstart/local/express/express-dev-env.sh
index 5cebd482e..87f11db3d 100644
--- a/quickstart/local/express/express-dev-env.sh
+++ b/quickstart/local/express/express-dev-env.sh
@@ -173,7 +173,6 @@ function generateEnvFile {
   export ZITI_ROUTER_RED_RAWNAME="${ZITI_NETWORK}"
 
   export ZITI_HOME=${HOME}/.ziti/quickstart/${ZITI_NETWORK}
-  export ENV_FILE="${ZITI_HOME}/${ZITI_NETWORK}.env"
   "${ZITI_SCRIPT_DIR}/../../docker/image/env.sh"
   echo -e "environment file created and source from: $(BLUE ${ENV_FILE})"
   source "${ENV_FILE}"