fix: dash for naming of sub-services, install script to resolve lates…

…t version correctly
av · Sep 27, 2024 · a00b571 · a00b571
1 parent fac319c
commit a00b571
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/compose.langfuse.yml b/compose.langfuse.yml
@@ -6,20 +6,20 @@ services:
     ports:
       - ${HARBOR_LANGFUSE_HOST_PORT}:3000
     depends_on:
-      langfusedb:
+      langfuse-db:
         condition: service_healthy
     environment:
-      - DATABASE_URL=postgresql://postgres:postgres@langfusedb:5432/postgres
+      - DATABASE_URL=postgresql://postgres:postgres@langfuse-db:5432/postgres
       - NEXTAUTH_URL=http://localhost:${HARBOR_LANGFUSE_HOST_PORT}
       - NEXTAUTH_SECRET=${HARBOR_LANGFUSE_NEXTAUTH_SECRET}
       - SALT=${HARBOR_LANGFUSE_SALT}
     networks:
       - harbor-network
 
-  langfusedb:
+  langfuse-db:
     image: postgres
     restart: always
-    container_name: ${HARBOR_CONTAINER_PREFIX}.langfusedb
+    container_name: ${HARBOR_CONTAINER_PREFIX}.langfuse-db
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 1s

diff --git a/compose.librechat.yml b/compose.librechat.yml
@@ -4,19 +4,19 @@ services:
     ports:
       - "${HARBOR_LIBRECHAT_HOST_PORT}:${HARBOR_LIBRECHAT_HOST_PORT}"
     depends_on:
-      - lcdb
-      - lcrag
+      - lc-db
+      - lc-rag
     image: ghcr.io/danny-avila/librechat-dev:latest
     networks:
       - harbor-network
     env_file: ./.env
     environment:
       - HOST=0.0.0.0
       - PORT=${HARBOR_LIBRECHAT_HOST_PORT}
-      - MONGO_URI=mongodb://lcdb:27017/LibreChat
-      - MEILI_HOST=http://lcsearch:7700
+      - MONGO_URI=mongodb://lc-db:27017/LibreChat
+      - MEILI_HOST=http://lc-search:7700
       - RAG_PORT=${HARBOR_LIBRECHAT_RAG_HOST_PORT}
-      - RAG_API_URL=http://lcrag:${HARBOR_LIBRECHAT_RAG_HOST_PORT}
+      - RAG_API_URL=http://lc-rag:${HARBOR_LIBRECHAT_RAG_HOST_PORT}
       - ANYSCALE_API_KEY=${HARBOR_ANYSCALE_KEY:-user_provided}
       - APIPIE_API_KEY=${HARBOR_APIPIE_KEY:-user_provided}
       - COHERE_API_KEY=${HARBOR_COHERE_KEY:-user_provided}
@@ -41,28 +41,28 @@ services:
       - ./librechat/images:/app/client/public/images
       - ./librechat/logs:/app/api/logs
 
-  lcdb:
-    container_name: ${HARBOR_CONTAINER_PREFIX}.lcdb
+  lc-db:
+    container_name: ${HARBOR_CONTAINER_PREFIX}.lc-db
     image: mongo
     volumes:
       - ./librechat/data:/data/db
     command: mongod --noauth
     networks:
       - harbor-network
 
-  lcsearch:
-    container_name: ${HARBOR_CONTAINER_PREFIX}.lcsearch
+  lc-search:
+    container_name: ${HARBOR_CONTAINER_PREFIX}.lc-search
     image: getmeili/meilisearch:v1.7.3
     environment:
-      - MEILI_HOST=http://lcsearch:7700
+      - MEILI_HOST=http://lc-search:7700
       - MEILI_NO_ANALYTICS=true
     volumes:
       - ./librechat/meili_data_v1.7:/meili_data
     networks:
       - harbor-network
 
-  lcvector:
-    container_name: ${HARBOR_CONTAINER_PREFIX}.lcvector
+  lc-vector:
+    container_name: ${HARBOR_CONTAINER_PREFIX}.lc-vector
     image: ankane/pgvector:latest
     environment:
       POSTGRES_DB: mydatabase
@@ -73,17 +73,17 @@ services:
     networks:
       - harbor-network
 
-  lcrag:
-    container_name: ${HARBOR_CONTAINER_PREFIX}.lcrag
+  lc-rag:
+    container_name: ${HARBOR_CONTAINER_PREFIX}.lc-rag
     image: ghcr.io/danny-avila/librechat-rag-api-dev-lite:latest
     environment:
-      - DB_HOST=lcvector
+      - DB_HOST=lc-vector
       - RAG_PORT=${HARBOR_LIBRECHAT_RAG_HOST_PORT}
       - EMBEDDINGS_PROVIDER=ollama
       - OLLAMA_BASE_URL=${HARBOR_OLLAMA_INTERNAL_URL}
       - EMBEDDINGS_MODEL=nomic-embed-text
     depends_on:
-      - lcvector
+      - lc-vector
     env_file:
       - .env
     networks:

diff --git a/compose.litellm.yml b/compose.litellm.yml
@@ -16,22 +16,22 @@ services:
     command: ['--config', '/app/proxy.yaml']
     entrypoint: ["/app/litellm/start_litellm.sh"]
     depends_on:
-      litellmdb:
+      litellm-db:
         condition: service_healthy
     ports:
       - ${HARBOR_LITELLM_HOST_PORT}:4000
     networks:
       - harbor-network
     environment:
       - LITELLM_MASTER_KEY=${HARBOR_LITELLM_MASTER_KEY}
-      - DATABASE_URL=postgresql://postgres:postgres@litellmdb:5432/postgres
+      - DATABASE_URL=postgresql://postgres:postgres@litellm-db:5432/postgres
       - UI_USERNAME=${HARBOR_LITELLM_UI_USERNAME}
       - UI_PASSWORD=${HARBOR_LITELLM_UI_PASSWORD}
 
-  litellmdb:
+  litellm-db:
     image: postgres
     restart: always
-    container_name: ${HARBOR_CONTAINER_PREFIX}.litellmdb
+    container_name: ${HARBOR_CONTAINER_PREFIX}.litellm-db
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 3s

diff --git a/compose.plandex.yml b/compose.plandex.yml
@@ -16,15 +16,15 @@ services:
     environment:
       - GOENV=development
       - PLANDEX_SKIP_UPGRADE=1
-      - PLANDEX_API_HOST=http://plandexserver:8080
+      - PLANDEX_API_HOST=http://plandex-server:8080
       # These will inject the default OpenAI API key and URL
       # See .x. files for the connections with other Harbor services
       - OPENAI_API_KEY=${HARBOR_OPENAI_KEY}
       - OPENAI_API_BASE=${HARBOR_OPENAI_URL}
 
-  plandexserver:
+  plandex-server:
     image: ghcr.io/wipash/plandex:rolling
-    container_name: ${HARBOR_CONTAINER_PREFIX}.plandexserver
+    container_name: ${HARBOR_CONTAINER_PREFIX}.plandex-server
     volumes:
       - ./plandex/data:/app/data
       # There's a bug with incorrect timezone that might
@@ -36,12 +36,12 @@ services:
     env_file: ./.env
     environment:
       GOENV: development
-      DATABASE_URL: postgresql://postgres:postgres@plandexdb:5432/postgres?sslmode=disable
+      DATABASE_URL: postgresql://postgres:postgres@plandex-db:5432/postgres?sslmode=disable
       PLANDEX_BASE_DIR: /app/data
     networks:
       - harbor-network
     depends_on:
-      plandexdb:
+      plandex-db:
         condition: service_healthy
     command:
       [
@@ -50,9 +50,9 @@ services:
         "./plandex-server"
       ]
 
-  plandexdb:
+  plandex-db:
     image: postgres
-    container_name: ${HARBOR_CONTAINER_PREFIX}.plandexdb
+    container_name: ${HARBOR_CONTAINER_PREFIX}.plandex-db
     env_file: ./.env
     ports:
       - ${HARBOR_PLANDEX_DB_HOST_PORT}:5432

diff --git a/install.sh b/install.sh
@@ -14,7 +14,7 @@ HARBOR_VERSION=""
 # ========================================
 
 resolve_harbor_version() {
-  git ls-remote --tags "$HARBOR_REPO_URL" | grep -o "v.*" | sort -r | head -n 1
+  git ls-remote --tags "$HARBOR_REPO_URL" | grep -o "v.*" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | head -n 1
 }
 
 check_dependencies() {