From d4ecb9896ddc1c09b107d012e031aa2af39b2264 Mon Sep 17 00:00:00 2001 From: Matheus Jacques Date: Mon, 28 Aug 2023 23:42:24 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(main.tf):=20add=20installa?= =?UTF-8?q?tion=20of=20git=20and=20docker-compose=20to=20improve=20deploym?= =?UTF-8?q?ent=20process=20=E2=9C=A8=20feat(main.tf):=20add=20cloning=20of?= =?UTF-8?q?=20langflow=20repository=20and=20checkout=20to=20celery=20branc?= =?UTF-8?q?h=20for=20specific=20project=20requirements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/.env.example | 35 +++++++++++++++++++ deploy/backend.env | 18 ---------- deploy/celeryworker.env | 8 ----- deploy/db.env | 3 -- deploy/flower.env | 10 ------ deploy/frontend.env | 3 -- deploy/pgadmin.env | 2 -- .../terraform/modules/docker-swarm/main.tf | 8 ++++- 8 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 deploy/backend.env delete mode 100644 deploy/celeryworker.env delete mode 100644 deploy/db.env delete mode 100644 deploy/flower.env delete mode 100644 deploy/frontend.env delete mode 100644 deploy/pgadmin.env diff --git a/deploy/.env.example b/deploy/.env.example index 4f8db086a..37af8772a 100644 --- a/deploy/.env.example +++ b/deploy/.env.example @@ -4,3 +4,38 @@ STACK_NAME=langflow-stack TRAEFIK_PUBLIC_NETWORK=traefik-public TRAEFIK_TAG=langflow-traefik TRAEFIK_PUBLIC_TAG=traefik-public + +# Database configuration +DB_USER=langflow +DB_PASSWORD=langflow +DB_HOST=db +DB_PORT=5432 +DB_NAME=langflow + +# Logging configuration +LOG_LEVEL=debug + +# DB configuration +POSTGRES_USER=langflow +POSTGRES_PASSWORD=langflow +POSTGRES_DB=langflow + +# Flower configuration +LANGFLOW_CACHE_TYPE=redis +LANGFLOW_REDIS_HOST=queue +LANGFLOW_REDIS_PORT=6379 +LANGFLOW_REDIS_DB=0 +LANGFLOW_REDIS_EXPIRE=3600 +LANGFLOW_REDIS_PASSWORD= +FLOWER_UNAUTHENTICATED_API=True +BROKER_URL=redis://queue:6379/0 +RESULT_BACKEND=redis://queue:6379/0 +C_FORCE_ROOT="true # ! Only for development" + +# Frontend configuration +VITE_PROXY_TARGET=http://backend:7860/api/ +BACKEND_URL=http://backend:7860 + +# PGAdmin configuration +PGADMIN_DEFAULT_EMAIL=admin@admin.com +PGADMIN_DEFAULT_PASSWORD=admin diff --git a/deploy/backend.env b/deploy/backend.env deleted file mode 100644 index d9cbdc1dc..000000000 --- a/deploy/backend.env +++ /dev/null @@ -1,18 +0,0 @@ -# Database configuration -DB_USER=langflow -DB_PASSWORD=langflow -DB_HOST=db -DB_PORT=5432 -DB_NAME=langflow - -# Logging configuration -LOG_LEVEL=debug - -# Cache configuration -LANGFLOW_CACHE_TYPE=redis - -# Redis configuration -LANGFLOW_REDIS_HOST=queue -LANGFLOW_REDIS_PORT=6379 -LANGFLOW_REDIS_DB=0 -LANGFLOW_REDIS_EXPIRE=3600 \ No newline at end of file diff --git a/deploy/celeryworker.env b/deploy/celeryworker.env deleted file mode 100644 index bbc6aa8c1..000000000 --- a/deploy/celeryworker.env +++ /dev/null @@ -1,8 +0,0 @@ -LANGFLOW_CACHE_TYPE=redis -LANGFLOW_REDIS_HOST=queue -LANGFLOW_REDIS_PORT=6379 -LANGFLOW_REDIS_DB=0 -LANGFLOW_REDIS_EXPIRE=3600 -BROKER_URL=redis://queue:6379/0 -RESULT_BACKEND=redis://queue:6379/0 -C_FORCE_ROOT="true # ! Only for development" diff --git a/deploy/db.env b/deploy/db.env deleted file mode 100644 index 64e9ce762..000000000 --- a/deploy/db.env +++ /dev/null @@ -1,3 +0,0 @@ -POSTGRES_USER=langflow -POSTGRES_PASSWORD=langflow -POSTGRES_DB=langflow diff --git a/deploy/flower.env b/deploy/flower.env deleted file mode 100644 index 652160629..000000000 --- a/deploy/flower.env +++ /dev/null @@ -1,10 +0,0 @@ -LANGFLOW_CACHE_TYPE=redis -LANGFLOW_REDIS_HOST=queue -LANGFLOW_REDIS_PORT=6379 -LANGFLOW_REDIS_DB=0 -LANGFLOW_REDIS_EXPIRE=3600 -LANGFLOW_REDIS_PASSWORD= -FLOWER_UNAUTHENTICATED_API=True -BROKER_URL=redis://queue:6379/0 -RESULT_BACKEND=redis://queue:6379/0 -C_FORCE_ROOT="true # ! Only for development" \ No newline at end of file diff --git a/deploy/frontend.env b/deploy/frontend.env deleted file mode 100644 index ca56a25a7..000000000 --- a/deploy/frontend.env +++ /dev/null @@ -1,3 +0,0 @@ - -VITE_PROXY_TARGET=http://backend:7860/api/ -BACKEND_URL=http://backend:7860 diff --git a/deploy/pgadmin.env b/deploy/pgadmin.env deleted file mode 100644 index 7ef01290b..000000000 --- a/deploy/pgadmin.env +++ /dev/null @@ -1,2 +0,0 @@ -PGADMIN_DEFAULT_EMAIL=admin@admin.com -PGADMIN_DEFAULT_PASSWORD=admin diff --git a/deploy/scripts/terraform/modules/docker-swarm/main.tf b/deploy/scripts/terraform/modules/docker-swarm/main.tf index ba1f873c3..bc05a4e24 100644 --- a/deploy/scripts/terraform/modules/docker-swarm/main.tf +++ b/deploy/scripts/terraform/modules/docker-swarm/main.tf @@ -20,7 +20,10 @@ resource "aws_instance" "manager" { #!/bin/bash sudo yum update -y sudo yum install -y docker + sudo yum install -y git sudo yum install -y nc + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose sudo service docker start sudo usermod -a -G docker ec2-user sudo chkconfig docker on @@ -34,7 +37,10 @@ resource "aws_instance" "manager" { # Create a script to get the join token echo 'docker swarm join-token worker -q' > get_token.sh chmod +x get_token.sh - while true; do { echo -e 'HTTP/1.1 200 OK\r\n'; ./get_token.sh; } | nc -l 8080; done & + timeout 5m bash -c "while true; do { echo -e 'HTTP/1.1 200 OK\r\n'; ./get_token.sh; } | nc -l 8080; done" & + + git clone https://github.com/logspace-ai/langflow.git + git checkout celery EOT