From ee39b7964ae6eb5f6936b21bf482fc6c0dceea91 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Wed, 1 Jun 2022 18:20:32 -0400
Subject: [PATCH] rev2 on getting the docker-compose env up to speed with the
 other quickstarts policy-wise and 'editable'

---
 quickstart/docker/docker-compose.yml      | 16 ++++++++++++++++
 quickstart/docker/image/Dockerfile        |  2 +-
 quickstart/docker/image/access-control.sh | 16 +++++++++++++---
 quickstart/docker/image/run-controller.sh | 15 +++++++++++++--
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml
index e85dca94c..d8fd554ef 100644
--- a/quickstart/docker/docker-compose.yml
+++ b/quickstart/docker/docker-compose.yml
@@ -17,6 +17,22 @@ services:
       - ziti-fs:/openziti
     entrypoint:
       - "/openziti/scripts/run-controller.sh"
+      -
+  ziti-controller-init-container:
+    image: "${ZITI_IMAGE}:${ZITI_VERSION}"
+    env_file:
+      - ./.env
+    networks:
+      zitiblue:
+        aliases:
+          - ziti-edge-controller-init-container
+      zitired:
+        aliases:
+          - ziti-edge-controller-init-container
+    volumes:
+      - ziti-fs:/openziti
+    entrypoint:
+      - "/openziti/scripts/access-control.sh"
 
   ziti-edge-router:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile
index 62d9922d1..e0712c207 100644
--- a/quickstart/docker/image/Dockerfile
+++ b/quickstart/docker/image/Dockerfile
@@ -25,7 +25,7 @@ COPY --chown=ziti ziti.ignore "${ZITI_BIN_DIR}"
 COPY --chown=ziti ziti-cli-functions.sh "${ZITI_SCRIPTS}/"
 COPY --chown=ziti run-controller.sh "${ZITI_SCRIPTS}/"
 COPY --chown=ziti run-router.sh "${ZITI_SCRIPTS}/"
-COPY --chown=ziti run-router.sh "${ZITI_SCRIPTS}/"
+COPY --chown=ziti access-control.sh "${ZITI_SCRIPTS}/"
 
 RUN /bin/bash -c "source ${ZITI_SCRIPTS}/ziti-cli-functions.sh; ziti_createEnvFile; echo source ${ZITI_HOME}/ziti.env >> ~/.bashrc"
 
diff --git a/quickstart/docker/image/access-control.sh b/quickstart/docker/image/access-control.sh
index f3fe80b17..28026f7f7 100755
--- a/quickstart/docker/image/access-control.sh
+++ b/quickstart/docker/image/access-control.sh
@@ -3,6 +3,14 @@
 # Should we execute?
 initFile="/openziti/access-control.init"
 if [[ -f "${initFile}" ]]; then
+  echo " "
+  echo "*****************************************************"
+  echo " docker-compose init file has been detected"
+  echo " the initialization of the docker-compose environment has already happened"
+  echo " if you wish to allow this volume to be re-initialized, delete the file"
+  echo " located at ${initFile}"
+  echo "*****************************************************"
+  echo " "
   exit 0
 fi
 
@@ -22,14 +30,16 @@ until $(curl -s -o /dev/null --fail -k "https://${ZITI_EDGE_CTRL_ADVERTISED_HOST
     sleep 2
 done
 
+echo " "
+echo "*****************************************************"
 #### Add service policies
 
 # Allow all identities to use any edge router with the "public" attribute
-ziti edge delete edge-router-policy all-endpoints-public-routers
 ziti edge create edge-router-policy all-endpoints-public-routers --edge-router-roles "#public" --identity-roles "#all"
 
 # Allow all edge-routers to access all services
-ziti edge delete service-edge-router-policy all-routers-all-services
 ziti edge create service-edge-router-policy all-routers-all-services --edge-router-roles "#all" --service-roles "#all"
 
-touch "${initFile}"
\ No newline at end of file
+touch "${initFile}"
+
+This docker volume has been initialized.
\ No newline at end of file
diff --git a/quickstart/docker/image/run-controller.sh b/quickstart/docker/image/run-controller.sh
index de06f3c2c..4c7933af1 100755
--- a/quickstart/docker/image/run-controller.sh
+++ b/quickstart/docker/image/run-controller.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+ziti_controller_cfg='/openziti/ziti-edge-controller.yaml'
+
 export ZITI_CONTROLLER_RAWNAME=ziti-controller
 export ZITI_EDGE_CONTROLLER_RAWNAME=ziti-edge-controller
 
@@ -11,8 +13,17 @@ generateEnvFile
 # create pki
 createPki
 
-# generates the config file for the controller
-createControllerConfig
+if [ ! -f "${ziti_controller_cfg}" ]; then
+  echo " "
+  echo "${ziti_controller_cfg} doesn't exist. Generating config file"
+  echo " "
+  # generates the config file for the controller
+  createControllerConfig
+else
+  echo " "
+  echo "${ziti_controller_cfg} exists. Not overwriting"
+  echo " "
+fi
 
 # initialize the database with the admin user:
 "${ZITI_BIN_DIR}/ziti-controller" edge init "${ZITI_HOME}/ziti-edge-controller.yaml" -u "${ZITI_USER}" -p "${ZITI_PWD}"