From e36ddbac6bc69e5b8eb59005306e15cf011ea5b7 Mon Sep 17 00:00:00 2001
From: Meng Zhang <wsxiaoys.lh@gmail.com>
Date: Thu, 6 Apr 2023 00:44:10 +0800
Subject: [PATCH] refactor: move scripts to tabby/ (#48)

---
 Dockerfile                              | 4 +---
 development/docker-compose.dev.yml      | 2 --
 {deployment => tabby}/scripts/tabby.sh  | 2 +-
 {deployment => tabby}/scripts/triton.sh | 0
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename {deployment => tabby}/scripts/tabby.sh (97%)
 rename {deployment => tabby}/scripts/triton.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index f61b18d..3896c80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,8 +53,6 @@ RUN --mount=type=cache,target=$HOME/.cache pip install -i $PYPI_INDEX_URL --no-d
 
 
 COPY tabby ./tabby
-COPY deployment/scripts/tabby.sh ./.bin/
-COPY deployment/scripts/triton.sh ./.bin/
 
 # Setup file permissions
 USER root
@@ -65,4 +63,4 @@ RUN mkdir -p $HOME/.cache
 RUN chown 1000 $HOME/.cache
 
 USER 1000
-CMD ["tabby.sh"]
+CMD ["./tabby/scripts/tabby.sh"]
diff --git a/development/docker-compose.dev.yml b/development/docker-compose.dev.yml
index 90c9084..a112a4b 100644
--- a/development/docker-compose.dev.yml
+++ b/development/docker-compose.dev.yml
@@ -13,5 +13,3 @@ services:
       STREAMLIT_RUN_ON_SAVE: true
     volumes:
       - ../tabby:/home/app/tabby
-      - ../deployment/scripts/tabby.sh:/home/app/.bin/tabby.sh:ro
-      - ../deployment/scripts/triton.sh:/home/app/.bin/triton.sh:ro
diff --git a/deployment/scripts/tabby.sh b/tabby/scripts/tabby.sh
similarity index 97%
rename from deployment/scripts/tabby.sh
rename to tabby/scripts/tabby.sh
index 95c53ad..38341a8 100755
--- a/deployment/scripts/tabby.sh
+++ b/tabby/scripts/tabby.sh
@@ -36,7 +36,7 @@ then
 
 local TRITON_SERVER=$(cat <<EOF
 [program:triton]
-command=triton.sh
+command=./tabby/scripts/triton.sh
 EOF
 )
 
diff --git a/deployment/scripts/triton.sh b/tabby/scripts/triton.sh
similarity index 100%
rename from deployment/scripts/triton.sh
rename to tabby/scripts/triton.sh