From c4bafe455a9d2f56ed8eb3c1e5fb88c43613d1ee Mon Sep 17 00:00:00 2001
From: Joe Crypto <joecrypto300@gmail.com>
Date: Fri, 23 Jun 2023 01:18:34 +0000
Subject: [PATCH] added tunnel

---
 Dockerfile-webserver => Dockerfile | 16 ++++++++--------
 Dockerfile-llmserver               | 21 ---------------------
 docker-compose.yml                 | 26 +++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 34 deletions(-)
 rename Dockerfile-webserver => Dockerfile (83%)
 delete mode 100644 Dockerfile-llmserver

diff --git a/Dockerfile-webserver b/Dockerfile
similarity index 83%
rename from Dockerfile-webserver
rename to Dockerfile
index bd6aa73dd..3b6d7ef92 100644
--- a/Dockerfile-webserver
+++ b/Dockerfile
@@ -1,23 +1,23 @@
 FROM nvidia/cuda:11.8.0-devel-ubuntu22.04
 
+WORKDIR /app
+
 RUN apt-get update && apt-get install -y \
 	git \
 	python3 \
 	pip
 
-	
-WORKDIR /app
-
-COPY . /app
-
-
 # upgrade pip
 RUN pip3 install --upgrade pip
 
+COPY ./requirements.txt /app/requirements.txt
+
 RUN pip install --no-cache-dir -r requirements.txt
 
 RUN python3 -m spacy download zh_core_web_sm
 
-EXPOSE 7860
 
-CMD ["python3", "pilot/server/webserver.py"]
+COPY . /app
+
+EXPOSE 7860
+EXPOSE 8000
\ No newline at end of file
diff --git a/Dockerfile-llmserver b/Dockerfile-llmserver
deleted file mode 100644
index c36567381..000000000
--- a/Dockerfile-llmserver
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM nvidia/cuda:11.8.0-devel-ubuntu22.04
-
-RUN apt-get update && apt-get install -y \
-	git \
-	python3 \
-	pip
-
-	
-WORKDIR /app
-
-COPY . /app
-
-
-# upgrade pip
-RUN pip3 install --upgrade pip
-
-RUN pip install --no-cache-dir -r requirements.txt
-
-EXPOSE 8000
-
-CMD ["python3", "pilot/server/llmserver.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f8dc9f52..9f17e160f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,11 +16,16 @@ services:
   webserver:
     build:
       context: .
-      dockerfile: Dockerfile-webserver
+      dockerfile: Dockerfile
+    command: python3 pilot/server/webserver.py
     environment:
       - MODEL_SERVER=http://llmserver:8000
       - LOCAL_DB_HOST=db
       - WEB_SERVER_PORT=7860
+      - ALLOWLISTED_PLUGINS=db_dashboard
+    depends_on:
+      - db
+      - llmserver
     volumes:
       - ./models:/app/models
       - ./plugins:/app/plugins
@@ -28,16 +33,19 @@ services:
     env_file:
       - .env.template
     ports:
-      - 7860:7860
+      - 7860:7860/tcp
     expose:
-      - 7860
+      - 7860/tcp
     restart: unless-stopped
   llmserver:
     build:
       context: .
-      dockerfile: Dockerfile-llmserver
+      dockerfile: Dockerfile
+    command: python3 pilot/server/llmserver.py
     environment:
       - LOCAL_DB_HOST=db
+    depends_on:
+      - db
     volumes:
       - ./models:/app/models
     env_file:
@@ -52,7 +60,15 @@ services:
             - driver: nvidia
               device_ids: ['0']
               capabilities: [gpu]
-
+  tunnel:
+    image: cloudflare/cloudflared:latest
+    container_name: cloudflared-tunnel
+    restart: unless-stopped
+    environment:
+      - TUNNEL_URL=http://webserver:7860
+    command: tunnel --no-autoupdate
+    depends_on:
+      - webserver
 
 
 volumes: