jmaddington
diff --git a/‎.devcontainer/Dockerfile
Lines changed: 9 additions & 0 deletions b/‎.devcontainer/Dockerfile
Lines changed: 9 additions & 0 deletions
diff --git a/‎.devcontainer/devcontainer.json
Lines changed: 1 addition & 1 deletion b/‎.devcontainer/devcontainer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎.devcontainer/docker-compose.yml
Lines changed: 19 additions & 17 deletions b/‎.devcontainer/docker-compose.yml
Lines changed: 19 additions & 17 deletions
diff --git a/‎.github/workflows/a11y.yml
Lines changed: 11 additions & 4 deletions b/‎.github/workflows/a11y.yml
Lines changed: 11 additions & 4 deletions
diff --git a/‎.github/workflows/backend-review.yml
Lines changed: 5 additions & 0 deletions b/‎.github/workflows/backend-review.yml
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-jm-build-only.yml
Lines changed: 43 additions & 0 deletions b/‎.github/workflows/deploy-jm-build-only.yml
Lines changed: 43 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-jm.yml
Lines changed: 62 additions & 0 deletions b/‎.github/workflows/deploy-jm.yml
Lines changed: 62 additions & 0 deletions
diff --git a/‎.github/workflows/eslint-ci.yml
Lines changed: 5 additions & 0 deletions b/‎.github/workflows/eslint-ci.yml
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/workflows/frontend-review.yml
Lines changed: 5 additions & 0 deletions b/‎.github/workflows/frontend-review.yml
Lines changed: 5 additions & 0 deletions
diff --git a/‎.gitignore
Lines changed: 2 additions & 0 deletions b/‎.gitignore
Lines changed: 2 additions & 0 deletions
@@ -1,5 +1,14 @@
 FROM node:18-bullseye
 
+RUN npm install -g @anthropic-ai/claude-code
 RUN useradd -m -s /bin/bash vscode
+
+# Install sudo and grant vscode user sudo privileges without password
+RUN apt-get update && apt-get install -y sudo \
+    && adduser vscode sudo \
+    && echo "vscode ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/vscode-nopasswd \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN mkdir -p /workspaces && chown -R vscode:vscode /workspaces
 WORKDIR /workspaces
@@ -1,6 +1,6 @@
 {
   "dockerComposeFile": "docker-compose.yml",
-  "service": "app",
+  "service": "app-lcdevcontainer",
   "workspaceFolder": "/workspaces",
   "customizations": {
     "vscode": {
 
@@ -1,28 +1,30 @@
 services:
-  app:
+  app-lcdevcontainer:
     build:
       context: ..
       dockerfile: .devcontainer/Dockerfile
     # restart: always
     links:
-      - mongodb
-      - meilisearch
-    # ports:
-    #   - 3080:3080               # Change it to 9000:3080 to use nginx
-    extra_hosts: # if you are running APIs on docker you need access to, you will need to uncomment this line and next
-    - "host.docker.internal:host-gateway"
+      - mongodb-lcdevcontainer
+      - meilisearch-lcdevcontainer
+    ports:
+      - 80:80
+      - 3080:3090               # Change it to 9000:3080 to use nginx
+      - 3090:3090
+    # extra_hosts: # if you are running APIs on docker you need access to, you will need to uncomment this line and next
+    # - "host.docker.internal:host-gateway"
 
     volumes:
       # This is where VS Code should expect to find your project's source code and the value of "workspaceFolder" in .devcontainer/devcontainer.json
       - ..:/workspaces:cached
       # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 
     environment:
-      - HOST=0.0.0.0
-      - MONGO_URI=mongodb://mongodb:27017/LibreChat
+      # - HOST=0.0.0.0
+      - MONGO_URI=mongodb://mongodb-lcdevcontainer:27017/LibreChat
       # - CHATGPT_REVERSE_PROXY=http://host.docker.internal:8080/api/conversation # if you are hosting your own chatgpt reverse proxy with docker
       # - OPENAI_REVERSE_PROXY=http://host.docker.internal:8070/v1/chat/completions # if you are hosting your own chatgpt reverse proxy with docker
-      - MEILI_HOST=http://meilisearch:7700
+      - MEILI_HOST=http://meilisearch-lcdevcontainer:7700
 
     # Runs app on the same network as the service container, allows "forwardPorts" in devcontainer.json function.
     # network_mode: service:another-service
@@ -36,26 +38,26 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: /bin/sh -c "while sleep 1000; do :; done"  
 
-  mongodb:
-    container_name: chat-mongodb
+  mongodb-lcdevcontainer:
+    container_name: chat-mongodb-lcdevcontainer
     expose:
       - 27017
     # ports:
-    #   - 27018:27017
+      - 27017:27017
     image: mongo
     # restart: always
     volumes:
       - ./data-node:/data/db
     command: mongod --noauth
-  meilisearch:
-    container_name: chat-meilisearch
+  meilisearch-lcdevcontainer:
+    container_name: chat-meilisearch-lcdevcontainer
     image: getmeili/meilisearch:v1.5
     # 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
+    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
 
@@ -2,21 +2,28 @@ name: Lint for accessibility issues
 
 on:
   pull_request:
+    branches: 
+      - main
+      - dev
+      - jm-production
+      - release/*
+      - 'tracking/**'
+      - 'feature/**'
     paths:
       - 'client/src/**'
   workflow_dispatch:
     inputs:
       run_workflow:
         description: 'Set to true to run this workflow'
-        required: true
-        default: 'false'
+        required: false
+        default: 'true'
 
 jobs:
   axe-linter:
     runs-on: ubuntu-latest
     if: >
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'danny-avila/LibreChat') ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.run_workflow == 'true')
+      (github.event_name == 'pull_request' && (github.event.pull_request.head.repo.full_name == 'jmaddington/LibreChat' || github.event.pull_request.head.repo.full_name == 'danny-avila/LibreChat')) ||
+      (github.event_name == 'workflow_dispatch')
     
     steps:
       - uses: actions/checkout@v4
 
@@ -4,9 +4,14 @@ on:
     branches:
       - main
       - dev
+      - jm-production
       - release/*
+      - 'tracking/**'
+      - 'feature/**'
     paths:
       - 'api/**'
+  workflow_dispatch:
+    # Allow manual triggering
 jobs:
   tests_Backend:
     name: Run Backend unit tests
 
@@ -0,0 +1,43 @@
+name: Docker Build Only (No Push)
+
+on:
+  # Allow manual triggering with custom parameters
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build from'
+        required: true
+        default: 'jm-production'
+        type: string
+      dockerfile:
+        description: 'Dockerfile to use'
+        required: false
+        default: 'Dockerfile.multi'
+        type: string
+
+jobs:
+  build-docker-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+        with:
+          # Use the specified branch from manual input or jm-production for auto runs
+          ref: ${{ github.event.inputs.branch || 'jm-production' }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build Docker image (without push)
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          # Use specified Dockerfile or default
+          file: ${{ github.event.inputs.dockerfile || 'Dockerfile.multi' }}
+          push: false
+          # Add build cache for faster builds
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          # Output built image to local Docker engine
+          load: true
+          tags: librechat:local-build
@@ -0,0 +1,62 @@
+name: Docker Build and Push to GHCR
+
+on:
+  # Allow manual triggering with custom parameters
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build from'
+        required: false
+        default: 'jm-production'
+        type: string
+      tag:
+        description: 'Docker image tag (default: latest)'
+        required: false
+        default: 'latest'
+        type: string
+      dockerfile:
+        description: 'Dockerfile to use'
+        required: false
+        default: 'Dockerfile.multi'
+        type: string
+  
+  # Automatic build on push to jm-production
+  push:
+    branches:
+      - jm-production
+
+jobs:
+  deploy-gh-runner-aci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+        with:
+          # Use the specified branch from manual input or jm-production for auto runs
+          ref: ${{ github.event.inputs.branch || 'jm-production' }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          # Use specified Dockerfile or default
+          file: ${{ github.event.inputs.dockerfile || 'Dockerfile.multi' }}
+          push: true
+          # Use specified tag or default to latest
+          tags: ghcr.io/jmaddington/librechat:${{ github.event.inputs.tag || 'latest' }}
+          # Add build cache for faster builds
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Log out from GitHub Docker Registry
+        run: docker logout ghcr.io
@@ -5,10 +5,15 @@ on:
     branches:
       - main
       - dev
+      - jm-production
       - release/*
+      - 'tracking/**'
+      - 'feature/**'
     paths:
       - 'api/**'
       - 'client/**'
+  workflow_dispatch:
+    # Allow manual triggering
 
 jobs:
   eslint_checks:
 
@@ -5,10 +5,15 @@ on:
     branches: 
       - main
       - dev
+      - jm-production
       - release/*
+      - 'tracking/**'
+      - 'feature/**'
     paths:
       - 'client/**'
       - 'packages/**'
+  workflow_dispatch:
+    # Allow manual triggering
 
 jobs:
   tests_frontend_ubuntu:
 
@@ -111,3 +111,5 @@ uploads/
 # owner
 release/
 !/client/src/@types/i18next.d.ts
+
+e2btemplates.yml
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dockerComposeFile": "docker-compose.yml",`
`3`		`- "service": "app",`
	`3`	`+ "service": "app-lcdevcontainer",`
`4`	`4`	`"workspaceFolder": "/workspaces",`
`5`	`5`	`"customizations": {`
`6`	`6`	`"vscode": {`