Update llmstack cli

Author: ajhai

docker/docker-compose.yml

@@ -1,33 +1,73 @@
 name: llmstack
 services:
   api:
-    image: ${REGISTRY:-ghcr.io/trypromptly/}llmstack-api:latest
+    image: ${REGISTRY:-}llmstack-api:${TAG:-latest}
     command: apiserver
     links:
       - postgres:postgres
     expose:
       - 9000
-    env_file:
-      - .env
+    environment:
+      LLMSTACK_PORT: ${LLMSTACK_PORT:-9000}
+      LLMSTACK_HOST: ${LLMSTACK_HOST:-localhost}
+      REDIS_HOST: ${REDIS_HOST:-redis}
+      REDIS_PORT: ${REDIS_PORT:-6379}
+      DEFAULT_OPENAI_API_KEY: ${DEFAULT_OPENAI_API_KEY:-}
+      VECTOR_DATABASE_ENGINE: ${VECTOR_DATABASE_ENGINE:-weaviate}
+      VECTOR_DATABASE_NAME: ${VECTOR_DATABASE_NAME:-llmstack}
+      USE_REMOTE_JOB_QUEUE: ${USE_REMOTE_JOB_QUEUE:-True}
+      DATABASE_NAME: ${DATABASE_NAME:-llmstack}
+      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgresql}
+      DATABASE_USERNAME: ${DATABASE_USERNAME:-llmstack}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-llmstack}
+      DATABASE_HOST: ${DATABASE_HOST:-postgres}
+      DATABASE_PORT: ${DATABASE_PORT:-5432}
+      ADMIN_EMAIL: ${ADMIN_EMAIL:-}
+      ADMIN_PASSWORD: ${ADMIN_PASSWORD:-}
+      ADMIN_USERNAME: ${ADMIN_USERNAME:-}
+      CIPHER_KEY_SALT: ${CIPHER_KEY_SALT:-}
+      SECRET_KEY: ${SECRET_KEY:-}
+      SITE_URL: ${SITE_URL:-http://localhost:3000}
+      SITE_NAME: ${SITE_NAME:-LLMStack}
+      DEBUG: ${DEBUG:-True}
     cap_add:
       - SYS_PTRACE
   rqworker:
-    image: ${REGISTRY:-ghcr.io/trypromptly/}llmstack-api:latest
+    image: ${REGISTRY:-}llmstack-api:${TAG:-latest}
     command: rqworker
     depends_on:
       - redis
       - postgres
     links:
       - redis:redis
       - postgres:postgres
-    env_file:
-      - .env
+    environment:
+      LLMSTACK_PORT: ${LLMSTACK_PORT:-9000}
+      LLMSTACK_HOST: ${LLMSTACK_HOST:-localhost}
+      REDIS_HOST: ${REDIS_HOST:-redis}
+      REDIS_PORT: ${REDIS_PORT:-6379}
+      DEFAULT_OPENAI_API_KEY: ${DEFAULT_OPENAI_API_KEY:-}
+      VECTOR_DATABASE_ENGINE: ${VECTOR_DATABASE_ENGINE:-weaviate}
+      VECTOR_DATABASE_NAME: ${VECTOR_DATABASE_NAME:-llmstack}
+      USE_REMOTE_JOB_QUEUE: ${USE_REMOTE_JOB_QUEUE:-True}
+      DATABASE_NAME: ${DATABASE_NAME:-llmstack}
+      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgresql}
+      DATABASE_USERNAME: ${DATABASE_USERNAME:-llmstack}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-llmstack}
+      DATABASE_HOST: ${DATABASE_HOST:-postgres}
+      DATABASE_PORT: ${DATABASE_PORT:-5432}
+      ADMIN_EMAIL: ${ADMIN_EMAIL:-}
+      ADMIN_PASSWORD: ${ADMIN_PASSWORD:-}
+      ADMIN_USERNAME: ${ADMIN_USERNAME:-}
+      CIPHER_KEY_SALT: ${CIPHER_KEY_SALT:-}
+      SECRET_KEY: ${SECRET_KEY:-}
+      SITE_URL: ${SITE_URL:-http://localhost:3000}
+      SITE_NAME: ${SITE_NAME:-LLMStack}
+      DEBUG: ${DEBUG:-True}
   app:
-    image: ${REGISTRY:-ghcr.io/trypromptly/}llmstack-app:latest
+    image: ${REGISTRY:-}llmstack-app:${TAG:-latest}
     ports:
       - 3000:80
-    env_file:
-      - .env
     depends_on:
       - api
   redis:
@@ -36,8 +76,6 @@ services:
     restart: unless-stopped
     volumes:
       - redisdata:/data
-    env_file:
-      - .env
   postgres:
     image: postgres:16-alpine
     command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
@@ -49,8 +87,6 @@ services:
       PGDATA: /var/lib/postgresql/data/pgdata
       POSTGRES_USER: ${DATABASE_USERNAME:-llmstack}
       POSTGRES_PASSWORD: ${DATABASE_PASSWORD:-llmstack}
-    env_file:
-      - .env
   weaviate:
     image: semitechnologies/weaviate:1.25.7
     volumes:
@@ -62,8 +98,6 @@ services:
       DEFAULT_VECTORIZER_MODULE: text2vec-openai
       ENABLE_MODULES: text2vec-openai
       CLUSTER_HOSTNAME: "weaviate-node"
-    env_file:
-      - .env
 volumes:
   redisdata:
   postgresdata: