From 16830570dd0a5221d284f716712ccfeffdc0d9ff Mon Sep 17 00:00:00 2001
From: Gabriel Luiz Freitas Almeida <gabriel@logspace.ai>
Date: Wed, 3 Apr 2024 21:10:12 -0300
Subject: [PATCH] Update workflow and Dockerfile for Langflow base pre-release

---
 .github/workflows/pre-release-base.yml     | 9 ++++-----
 .github/workflows/pre-release-langflow.yml | 5 ++---
 build_and_push.Dockerfile                  | 7 +++++--
 build_and_push_base.Dockerfile             | 6 +-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pre-release-base.yml b/.github/workflows/pre-release-base.yml
index 762bac3e9..60872def3 100644
--- a/.github/workflows/pre-release-base.yml
+++ b/.github/workflows/pre-release-base.yml
@@ -1,4 +1,4 @@
-name: pre-release-base
+name: Langflow Base Pre-release
 
 on:
   pull_request:
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
-        run: pipx install poetry==$POETRY_VERSION && poetry self add poetry-monorepo-dependency-plugin
+        run: pipx install poetry==$POETRY_VERSION
       - name: Set up Python 3.10
         uses: actions/setup-python@v5
         with:
@@ -61,7 +61,6 @@ jobs:
         with:
           context: .
           push: true
-          file: ./build_and_push.Dockerfile
+          file: ./build_and_push_base.Dockerfile
           tags: |
-            logspace/langflow:${{ steps.check-version.outputs.version }}
-            logspace/langflow:latest-dev
+            logspace/langflow:base-${{ steps.check-version.outputs.version }}
diff --git a/.github/workflows/pre-release-langflow.yml b/.github/workflows/pre-release-langflow.yml
index 102004613..57f3b3e1a 100644
--- a/.github/workflows/pre-release-langflow.yml
+++ b/.github/workflows/pre-release-langflow.yml
@@ -1,4 +1,4 @@
-name: pre-release-langflow
+name: Langflow Pre-release
 
 on:
   pull_request:
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
-        run: pipx install poetry==$POETRY_VERSION && poetry self add poetry-monorepo-dependency-plugin
+        run: pipx install poetry==$POETRY_VERSION
       - name: Set up Python 3.10
         uses: actions/setup-python@v5
         with:
@@ -68,4 +68,3 @@ jobs:
           file: ./build_and_push.Dockerfile
           tags: |
             logspace/langflow:${{ steps.check-version.outputs.version }}
-            logspace/langflow:latest-dev
diff --git a/build_and_push.Dockerfile b/build_and_push.Dockerfile
index 136f34f9e..1c595e180 100644
--- a/build_and_push.Dockerfile
+++ b/build_and_push.Dockerfile
@@ -65,8 +65,11 @@ COPY src ./src
 COPY scripts ./scripts
 COPY Makefile ./
 COPY README.md ./
-RUN make build
-
+RUN --mount=type=cache,target=/root/.cache \
+    curl -sSL https://install.python-poetry.org | python3 -
+RUN python -m pip install requests && cd ./scripts && python update_dependencies.py
+RUN $POETRY_HOME/bin/poetry lock
+RUN $POETRY_HOME/bin/poetry build
 # Final stage for the application
 FROM python-base as final
 
diff --git a/build_and_push_base.Dockerfile b/build_and_push_base.Dockerfile
index 1aa7ee950..f5092c81c 100644
--- a/build_and_push_base.Dockerfile
+++ b/build_and_push_base.Dockerfile
@@ -74,6 +74,7 @@ COPY Makefile ./
 COPY README.md ./
 RUN cd src/frontend && npm run build
 COPY src/backend ./src/backend
+RUN cp -r src/frontend/build src/backend/base/langflow/frontend
 RUN rm -rf src/backend/base/dist
 RUN cd src/backend/base && $POETRY_HOME/bin/poetry build --format sdist
 
@@ -86,10 +87,5 @@ COPY --from=builder-base /app/src/backend/base/dist/*.tar.gz ./
 # Install the package from the .tar.gz
 RUN pip install *.tar.gz
 
-# Now remove the .tar.gz
-RUN rm *.tar.gz
-# Remove the source code
-RUN rm -rf /app
-
 WORKDIR /app
 CMD ["python", "-m", "langflow", "run", "--host", "0.0.0.0", "--port", "7860"]