Fix images and remove depends_on

This commit is contained in:
Matheus Jacques 2023-09-07 16:47:08 +02:00
commit 87339b9442
2 changed files with 5 additions and 38 deletions

View file

@ -30,7 +30,7 @@ LANGFLOW_REDIS_PASSWORD=
FLOWER_UNAUTHENTICATED_API=True FLOWER_UNAUTHENTICATED_API=True
BROKER_URL=redis://queue:6379/0 BROKER_URL=redis://queue:6379/0
RESULT_BACKEND=redis://queue:6379/0 RESULT_BACKEND=redis://queue:6379/0
C_FORCE_ROOT="true # ! Only for development" C_FORCE_ROOT="true"
# Frontend configuration # Frontend configuration
VITE_PROXY_TARGET=http://backend:7860/api/ VITE_PROXY_TARGET=http://backend:7860/api/

View file

@ -67,18 +67,11 @@ services:
- traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect
backend: backend:
image: "langflow:${TAG-latest}" image: "ogabrielluiz/langflow:latest"
build: build:
context: ../ context: ../
dockerfile: base.Dockerfile dockerfile: base.Dockerfile
# user: your-non-root-user # Make sure your Dockerfile creates this user # user: your-non-root-user # Make sure your Dockerfile creates this user
depends_on:
db:
condition: service_healthy
queue:
condition: service_healthy
env_file:
- backend.env
# ports: # ports:
# - 7860 # - 7860
volumes: volumes:
@ -98,8 +91,6 @@ services:
image: postgres:15.4 image: postgres:15.4
volumes: volumes:
- app-db-data:/var/lib/postgresql/data/pgdata - app-db-data:/var/lib/postgresql/data/pgdata
env_file:
- db.env
environment: environment:
- PGDATA=/var/lib/postgresql/data/pgdata - PGDATA=/var/lib/postgresql/data/pgdata
deploy: deploy:
@ -114,11 +105,6 @@ services:
networks: networks:
- ${TRAEFIK_PUBLIC_NETWORK?Variable not set} - ${TRAEFIK_PUBLIC_NETWORK?Variable not set}
- default - default
env_file:
- ./pgadmin.env
depends_on:
db:
condition: service_healthy
volumes: volumes:
- ./pgadmin:/var/lib/pgadmin - ./pgadmin:/var/lib/pgadmin
deploy: deploy:
@ -143,12 +129,7 @@ services:
test: "exit 0" test: "exit 0"
celeryworker: celeryworker:
image: "langflow:${TAG-latest}" image: "ogabrielluiz/langflow:latest"
depends_on:
queue:
condition: service_healthy
env_file:
- ./celeryworker.env
build: build:
context: ../ context: ../
dockerfile: base.Dockerfile dockerfile: base.Dockerfile
@ -162,13 +143,6 @@ services:
image: mher/flower image: mher/flower
networks: networks:
- default - default
depends_on:
queue:
condition: service_healthy
celeryworker:
condition: service_healthy
env_file:
- ./flower.env
environment: environment:
- CELERY_BROKER_URL='redis://$${LANGFLOW_REDIS_PASSWORD:+default:$${LANGFLOW_REDIS_PASSWORD}@}$${LANGFLOW_REDIS_HOST}:$${LANGFLOW_REDIS_PORT}/$${LANGFLOW_REDIS_DB}' - CELERY_BROKER_URL='redis://$${LANGFLOW_REDIS_PASSWORD:+default:$${LANGFLOW_REDIS_PASSWORD}@}$${LANGFLOW_REDIS_HOST}:$${LANGFLOW_REDIS_PORT}/$${LANGFLOW_REDIS_DB}'
- FLOWER_PORT=5555 - FLOWER_PORT=5555
@ -187,17 +161,13 @@ services:
- traefik.http.services.${STACK_NAME?Variable not set}-flower.loadbalancer.server.port=5555 - traefik.http.services.${STACK_NAME?Variable not set}-flower.loadbalancer.server.port=5555
frontend: frontend:
image: "ogabrielluiz/langflow_frontend:latest"
# user: your-non-root-user # user: your-non-root-user
build: build:
context: ../src/frontend context: ../src/frontend
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- BACKEND_URL=http://backend:7860 - BACKEND_URL=http://backend:7860
depends_on:
backend:
condition: service_healthy
env_file:
- ./frontend.env
restart: on-failure restart: on-failure
deploy: deploy:
labels: labels:
@ -225,9 +195,6 @@ services:
grafana: grafana:
image: grafana/grafana:8.2.6 image: grafana/grafana:8.2.6
depends_on:
prometheus:
condition: service_healthy
# ports: # ports:
# - 3000:3000 # - 3000:3000
volumes: volumes:
@ -246,4 +213,4 @@ volumes:
networks: networks:
traefik-public: traefik-public:
# Allow setting it to false for testing # Allow setting it to false for testing
external: false # ${TRAEFIK_PUBLIC_NETWORK_IS_EXTERNAL-true} external: false # ${TRAEFIK_PUBLIC_NETWORK_IS_EXTERNAL-true}