Merge pull request #42 from flomesh-io/fix/dockerfile

fix(docker): Added data env var
flomesh-io · Aug 14, 2024 · 32459ca · 32459ca
2 parents 2fe77f1 + ff25e2b
commit 32459ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
@@ -34,6 +34,7 @@ FROM minimal AS hub
 # Set environment variables
 ENV ZTM_NAMES=${ZTM_NAMES:-0.0.0.0}
 ENV ZTM_PORT=${ZTM_PORT:-8888}
+ENV ZTM_DATA=${ZTM_DATA:-~/.ztm}
 
 # Expose the required port
 EXPOSE ${ZTM_PORT}
@@ -60,6 +61,7 @@ ENV ZTM_ENDPOINT=${ZTM_ENDPOINT}
 
 ENV ZTM_PORT=${ZTM_PORT:-7777}
 ENV ZTM_PERMIT=${ZTM_PERMIT:-/permit}
+ENV ZTM_DATA=${ZTM_DATA:-~/.ztm}
 
 # Expose the required port
 EXPOSE ${ZTM_PORT}

diff --git a/build/docker/agent-docker-entrypoint.sh b/build/docker/agent-docker-entrypoint.sh
@@ -16,4 +16,4 @@ ZTM_PORT=${ZTM_PORT:-7777}
 ZTM_PERMIT=${ZTM_PERMIT:-/permit}
 
 # Run the command
-exec /usr/local/bin/ztm run agent --listen 0.0.0.0:$ZTM_PORT --permit ${ZTM_PERMIT}/ztm-permit.json --join $ZTM_JOIN_MESH --join-as $ZTM_ENDPOINT
+exec /usr/local/bin/ztm run agent --listen 0.0.0.0:$ZTM_PORT --data ${ZTM_DATA} --permit ${ZTM_PERMIT}/ztm-permit.json --join $ZTM_JOIN_MESH --join-as $ZTM_ENDPOINT
diff --git a/build/docker/hub-docker-entrypoint.sh b/build/docker/hub-docker-entrypoint.sh
@@ -3,4 +3,4 @@
 ZTM_NAMES=${ZTM_NAMES:-0.0.0.0}
 ZTM_PORT=${ZTM_PORT:-8888}
 
-exec /usr/local/bin/ztm run hub --listen 0.0.0.0:${ZTM_PORT} --names "${ZTM_NAMES}:${ZTM_PORT}" --permit /permit/root.json
+exec /usr/local/bin/ztm run hub --listen 0.0.0.0:${ZTM_PORT} --data ${ZTM_DATA} --names "${ZTM_NAMES}:${ZTM_PORT}" --permit /permit/root.json