diff --git a/services/vendors/docker-compose.yml.j2 b/services/vendors/docker-compose.yml.j2 index c1a49ade..7a8149c2 100644 --- a/services/vendors/docker-compose.yml.j2 +++ b/services/vendors/docker-compose.yml.j2 @@ -63,40 +63,7 @@ services: - traefik.http.services.vendor_chat_backend.loadbalancer.server.port=${VENDOR_CHATBOT_BACKEND_PORT} - traefik.http.routers.vendor_chat_backend.entrypoints=https - traefik.http.routers.vendor_chat_backend.tls=true - - traefik.http.routers.vendor_chat_backend.rule=(PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }})) - networks: - - public - chat-frontend: - image: ${VENDOR_CHATBOT_FRONTEND_IMAGE} - init: true -{%- raw %} - hostname: "v-chat-frontend-{{.Node.Hostname}}-{{.Task.Slot}}" -{%- endraw %} - deploy: - replicas: ${VENDOR_CHATBOT_FRONTEND_REPLICAS} - placement: - constraints: - - node.labels.simcore==true - resources: - limits: - cpus: "1.0" - memory: 2.5G - reservations: - cpus: "0.1" - memory: 512M - update_config: - parallelism: 1 - order: start-first - failure_action: continue - delay: 10s - labels: - - traefik.enable=true - - traefik.swarm.network=${PUBLIC_NETWORK} - - traefik.http.services.vendor_chat_frontend.loadbalancer.server.port=${VENDOR_CHATBOT_FRONTEND_PORT} - - traefik.http.routers.vendor_chat_frontend.entrypoints=https - - traefik.http.routers.vendor_chat_frontend.tls=true - - traefik.http.routers.vendor_chat_frontend.rule=(!PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }})) - - traefik.http.routers.vendor_chat_frontend.middlewares=authenticated_platform_user@swarm + - traefik.http.routers.vendor_chat_backend.rule=(PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_PRODUCTS, VENDOR_CHATBOT_SUBDOMAIN_PREFIX) }})) networks: - public networks: diff --git a/services/vendors/template.env b/services/vendors/template.env index 7fbe5a61..23a1d554 100644 --- a/services/vendors/template.env +++ b/services/vendors/template.env @@ -6,10 +6,7 @@ VENDOR_MANUAL_PORT=${VENDOR_MANUAL_PORT} VENDOR_CHATBOT_BACKEND_IMAGE=${VENDOR_CHATBOT_BACKEND_IMAGE} VENDOR_CHATBOT_BACKEND_PORT=${VENDOR_CHATBOT_BACKEND_PORT} VENDOR_CHATBOT_BACKEND_REPLICAS=${VENDOR_CHATBOT_BACKEND_REPLICAS} -VENDOR_CHATBOT_FRONTEND_IMAGE=${VENDOR_CHATBOT_FRONTEND_IMAGE} -VENDOR_CHATBOT_FRONTEND_PORT=${VENDOR_CHATBOT_FRONTEND_PORT} -VENDOR_CHATBOT_FRONTEND_PRODUCTS=${VENDOR_CHATBOT_FRONTEND_PRODUCTS} -VENDOR_CHATBOT_FRONTEND_REPLICAS=${VENDOR_CHATBOT_FRONTEND_REPLICAS} -VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX} +VENDOR_CHATBOT_PRODUCTS=${VENDOR_CHATBOT_PRODUCTS} +VENDOR_CHATBOT_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_SUBDOMAIN_PREFIX} PUBLIC_NETWORK=${PUBLIC_NETWORK} OPENAI_API_KEY=${OPENAI_API_KEY}