From 140feadb7e021438843e86a16b153ae465506a00 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 9 Jul 2024 17:31:36 -0400
Subject: [PATCH] refactor: Update devcontainer setup and Docker Compose
 configuration

---
 .devcontainer/Dockerfile         | 10 +---------
 .devcontainer/devcontainer.json  |  4 ++--
 .devcontainer/docker-compose.yml |  7 +------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 80125d82f6..c3f7d68b66 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,15 +27,7 @@ RUN echo "vscode ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/vscode && \
 
 USER vscode
 
-WORKDIR /workspaces
-
-# Copy package.json and package-lock.json
-COPY package*.json ./
-
-# Run npm install and other commands
-RUN npm run reinstall && \
-    npm run pull:rag && \
-    npm run copy-ex
+WORKDIR /workspaces/LibreChat
 
 # Set the default command
 CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 63d9e5b236..152fe7e60b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
   "name": "LibreChat Development",
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
-  "workspaceFolder": "/workspaces",
+  "workspaceFolder": "/workspaces/LibreChat",
   "customizations": {
     "vscode": {
       "extensions": ["ms-azuretools.vscode-docker"]
@@ -16,7 +16,7 @@
     }
   },
   "remoteUser": "vscode",
-  "postCreateCommand": "sudo chown root:docker /var/run/docker.sock && sudo chmod 660 /var/run/docker.sock",
+  "postCreateCommand": "sudo chown root:docker /var/run/docker.sock && sudo chmod 660 /var/run/docker.sock && npm run reinstall && npm run pull:rag && npm run copy-ex && MEILI_MASTER_KEY=$(docker-compose -f .devcontainer/docker-compose.yml exec -T meilisearch printenv MEILI_MASTER_KEY) && sed -i \"s/^MEILI_MASTER_KEY=.*/MEILI_MASTER_KEY=$MEILI_MASTER_KEY/\" .env",
   "remoteEnv": {
     "INSTALL_DOCKER": "${localEnv:INSTALL_DOCKER:false}"
   }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 5d10925f3b..ca1181b923 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -49,8 +49,6 @@ services:
     container_name: chat-mongodb
     expose:
       - 27017
-    # ports:
-    #   - 27018:27017
     image: mongo
     # restart: always
     volumes:
@@ -62,11 +60,8 @@ services:
     # restart: always
     expose:
       - 7700
-    # Uncomment this to access meilisearch from outside docker
-    # ports: 
-    #   - 7700:7700 # if exposing these ports, make sure your master key is not the default value
     environment:
       - MEILI_NO_ANALYTICS=true
-      - MEILI_MASTER_KEY=5c71cf56d672d009e36070b5bc5e47b743535ae55c818ae3b735bb6ebfb4ba63
+      - MEILI_MASTER_KEY=${MEILI_MASTER_KEY:-$(openssl rand -hex 16)}
     volumes:
       - ./meili_data_v1.5:/meili_data