From b47271c2129b5d00a9cf074b504fa34e0ce038a5 Mon Sep 17 00:00:00 2001
From: powermaker450 <contact@povario.com>
Date: Fri, 26 Jul 2024 17:17:03 -0400
Subject: [PATCH] Remove unnecessary stuff from the Docker build and compose

---
 .dockerignore      |  6 ++++++
 Dockerfile         | 12 ++++--------
 docker-compose.yml |  5 ++---
 entrypoint.sh      | 16 ----------------
 4 files changed, 12 insertions(+), 27 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..6920c8a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.env
+.env.example
+*.md
+dist
+prepare
+node_modules
diff --git a/Dockerfile b/Dockerfile
index b8a6e3f..5df90dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,9 @@
 FROM node:20.12.2-alpine
 
-RUN apk update > /dev/null && apk add git > /dev/null
-
-RUN git clone https://git.povario.com/powermaker450/Tailchat-Assistant app > /dev/null
-
+RUN mkdir /app
 WORKDIR /app
+COPY . .
+
 RUN npm i && npm run build
 
 ENV HOST="http://localhost:11000"
@@ -19,7 +18,4 @@ ENV TEMPERATURE=1
 ENV ALLOWED_CHAT=""
 ENV SAFE_WORD="\\"
 
-COPY ./entrypoint.sh ./entrypoint.sh
-RUN chmod +x ./entrypoint.sh
-
-ENTRYPOINT ["sh", "-c", "./entrypoint.sh"]
+CMD ["npm", "run", "start"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d146deb..1de8990 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,6 @@ services:
     image: tailchat_assistant
     build:
       context: .
-    env_file: ".env"
     environment:
       - HOST=${HOST}
       - ID=${ID}
@@ -17,7 +16,7 @@ services:
       - ALLOWED_CHAT=${ALLOWED_CHAT}
       - SAFE_WORD=${SAFE_WORD}
     volumes:
-      - tailchat-assistant-data:/app/persist
+      - messages:/app/persist
 
 volumes:
-  - tailchat-assistant-data:
+  messages:
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100644
index 142d4d2..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-cd /app
-
-echo "" > .env && \
-  echo "HOST=$HOST" >> .env && \
-  echo "ID=$ID" >> .env && \
-  echo "SECRET=$SECRET" >> .env && \
-  echo "API_ENDPOINT=$API_ENDPOINT" >> .env && \
-  echo "API_KEY=$API_KEY" >> .env && \
-  echo "TEXT_MODEL=$TEXT_MODEL" >> .env && \
-  echo "CREATE_IMAGE_MODEL=$CREATE_IMAGE_MODEL" >> .env && \
-  echo "ANALYZE_IMAGE_MODEL=$ANALYZE_IMAGE_MODEL" >> .env && \
-  echo "TEMPERATURE=$TEMPERATURE" >> .env && \
-  echo "ALLOWED_CHAT=$ALLOWED_CHAT" >> .env && \
-  echo "SAFE_WORD=$SAFE_WORD" >> .env
-
-npm run start