From c990ba843f33eb53904ca4fc63d6689712fadee6 Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Mon, 27 Mar 2023 13:41:22 +0800
Subject: [PATCH] Extract environment variable

---
 deployment/.env               |  2 ++
 deployment/docker-compose.yml | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 deployment/.env

diff --git a/deployment/.env b/deployment/.env
new file mode 100644
index 0000000..2661f80
--- /dev/null
+++ b/deployment/.env
@@ -0,0 +1,2 @@
+MODEL_NAME=TabbyML/J-350M
+HF_VOLUME="../data/hf_cache:/root/.cache/huggingface"
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 25ccb11..f6ba539 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -4,21 +4,21 @@ services:
   init:
     image: tabbyml/tabby
     container_name: tabby-init
-    command: python -m tabby.tools.model_preload --repo_id TabbyML/J-350M
+    command: python -m tabby.tools.model_preload --repo_id ${MODEL_NAME}
     volumes:
-      - ../data/hf_cache:/root/.cache/huggingface
+      - ${HF_VOLUME}
 
   server:
     image: tabbyml/tabby
     container_name: tabby-server
     command: uvicorn tabby.server:app --host 0.0.0.0 --port 5000
     environment:
-      - MODEL_NAME=TabbyML/J-350M
-      - MODEL_BACKEND=triton
+      MODEL_NAME: ${MODEL_NAME}
+      MODEL_BACKEND: triton
     ports:
       - "5000:5000"
     volumes:
-      - ../data/hf_cache:/root/.cache/huggingface
+      - ${HF_VOLUME}
     depends_on:
       init:
         condition: service_completed_successfully
@@ -39,7 +39,7 @@ services:
     shm_size: 1gb
     volumes:
       - ./scripts:/scripts
-      - ../data/hf_cache:/root/.cache/huggingface
+      - ${HF_VOLUME}
     deploy:
       resources:
         reservations:
@@ -48,7 +48,7 @@ services:
               count: all
               capabilities: [gpu]
     environment:
-      - MODEL_NAME=TabbyML/J-350M
+      MODEL_NAME: ${MODEL_NAME}
     depends_on:
       init:
         condition: service_completed_successfully