From 2ea48ef37c121ffd9e2c5a78eb6f05d23c173798 Mon Sep 17 00:00:00 2001
From: gberl002 <geoff.berl@netfoundry.io>
Date: Fri, 2 Dec 2022 15:46:18 -0500
Subject: [PATCH] Keep certain files in the container so they can be updated in
 docker-compose environments Closes #912

Signed-off-by: gberl002 <geoff.berl@netfoundry.io>
---
 quickstart/docker/docker-compose.yml            | 16 ++++++++--------
 quickstart/docker/image/Dockerfile              |  9 ++++++---
 quickstart/docker/simplified-docker-compose.yml |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml
index 635e05b00..75be2af1f 100644
--- a/quickstart/docker/docker-compose.yml
+++ b/quickstart/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint:
-      - "/openziti/scripts/run-controller.sh"
+      - "/mutable-ziti/scripts/run-controller.sh"
 
   ziti-controller-init-container:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -40,9 +40,9 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint:
-      - "/openziti/scripts/run-with-ziti-cli.sh"
+      - "/mutable-ziti/scripts/run-with-ziti-cli.sh"
     command:
-      - "/openziti/scripts/access-control.sh"
+      - "/mutable-ziti/scripts/access-control.sh"
 
   ziti-edge-router:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -61,7 +61,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh edge"
+    command: "/mutable-ziti/scripts/run-router.sh edge"
 
   ziti-edge-router-wss:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -81,7 +81,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh wss"
+    command: "/mutable-ziti/scripts/run-router.sh wss"
 
   ziti-fabric-router-br:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -99,7 +99,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh fabric"
+    command: "/mutable-ziti/scripts/run-router.sh fabric"
 
   ziti-private-red:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -116,7 +116,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh private"
+    command: "/mutable-ziti/scripts/run-router.sh private"
 
   ziti-private-blue:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -133,7 +133,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh private"
+    command: "/mutable-ziti/scripts/run-router.sh private"
 
   web-test-blue:
     image: crccheck/hello-world
diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile
index 609f6bd77..c48b173c9 100644
--- a/quickstart/docker/image/Dockerfile
+++ b/quickstart/docker/image/Dockerfile
@@ -6,17 +6,20 @@ RUN apt update && \
 RUN useradd -ms /bin/bash ziti && \
     mkdir /openziti && chown ziti:ziti /openziti && \
     mkdir /openziti/scripts && chown ziti:ziti /openziti/scripts && \
-    mkdir /openziti/shared && chown ziti:ziti /openziti/shared
+    mkdir /openziti/shared && chown ziti:ziti /openziti/shared && \
+    mkdir /mutable-ziti && chown ziti:ziti /mutable-ziti
 
 USER ziti
 WORKDIR /openziti
 
 ENV ZITI_HOME=/openziti
-ENV ZITI_BIN_DIR="${ZITI_HOME}/ziti-bin"
 ENV ZITI_SHARED="${ZITI_HOME}/shared"
-ENV ZITI_SCRIPTS="${ZITI_HOME}/scripts"
 ENV ENV_FILE="${ZITI_HOME}/ziti.env"
 ENV ZITI_NETWORK=ziti
+# Don't put these paths on volume shared in docker-compose deployment (https://github.com/openziti/ziti/issues/912)
+ENV MUTABLE_HOME=/mutable-ziti
+ENV ZITI_BIN_DIR="${MUTABLE_HOME}/ziti-bin"
+ENV ZITI_SCRIPTS="${MUTABLE_HOME}/scripts"
 
 RUN mkdir -p "${ZITI_SCRIPTS}"
 
diff --git a/quickstart/docker/simplified-docker-compose.yml b/quickstart/docker/simplified-docker-compose.yml
index 183ebfce4..4c398a6d8 100644
--- a/quickstart/docker/simplified-docker-compose.yml
+++ b/quickstart/docker/simplified-docker-compose.yml
@@ -16,7 +16,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint:
-      - "/openziti/scripts/run-controller.sh"
+      - "/mutable-ziti/scripts/run-controller.sh"
 
   ziti-controller-init-container:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -37,9 +37,9 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint:
-      - "/openziti/scripts/run-with-ziti-cli.sh"
+      - "/mutable-ziti/scripts/run-with-ziti-cli.sh"
     command:
-      - "/openziti/scripts/access-control.sh"
+      - "/mutable-ziti/scripts/access-control.sh"
       
   ziti-edge-router:
     image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -56,7 +56,7 @@ services:
     volumes:
       - ziti-fs:/openziti
     entrypoint: /bin/bash
-    command: "/openziti/scripts/run-router.sh edge"
+    command: "/mutable-ziti/scripts/run-router.sh edge"
 
   ziti-console:
     image: openziti/zac