From 48baeb127d07e781c17221fd4114dbec18d6d1a0 Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Sun, 19 Mar 2023 11:11:47 -0300 Subject: [PATCH 1/3] fix: new frontend dev.dockerfile #21 --- docker-compose.yml | 8 +++----- src/frontend/dev.Dockerfile | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c7aa27a65..86255ea8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,9 +18,7 @@ services: ports: - "3000:3000" volumes: - - ./src/frontend:/app - # Set process.env.BACKEND to the backend service - environment: - - BACKEND_HOST="http://backend" - - BACKEND_PORT="7860" + - ./src/frontend/public:/home/node/app/public + - ./src/frontend/src:/home/node/app/src + - ./src/frontend/package.json:/home/node/app/package.json restart: on-failure diff --git a/src/frontend/dev.Dockerfile b/src/frontend/dev.Dockerfile index 90766088c..df7028c24 100644 --- a/src/frontend/dev.Dockerfile +++ b/src/frontend/dev.Dockerfile @@ -1,6 +1,13 @@ -FROM node:19-alpine as frontend_build -ARG BACKEND -WORKDIR /app -COPY . /app -RUN npm install +#baseline +FROM node:19-alpine AS base +RUN mkdir -p /home/node/app +RUN chown -R node:node /home/node && chmod -R 770 /home/node +WORKDIR /home/node/app + +# client build +FROM base AS builder-client +WORKDIR /home/node/app +COPY --chown=node:node . ./ +USER node +RUN npm install --loglevel warn CMD ["npm", "start"] \ No newline at end of file From 5de2e71ddcce8834986d5af2d76ea166ff5f630d Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Sun, 19 Mar 2023 21:43:14 -0300 Subject: [PATCH 2/3] feat: added dev command to makefile This should create a reliable way to run the development environment. --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0548f006..ec015431e 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,10 @@ build: poetry build --format sdist rm -rf src/backend/langflow/frontend +dev: + make install_frontend + docker compose up --build + publish: make build poetry publish @@ -49,4 +53,8 @@ help: @echo 'lint - run linters' @echo 'install_frontend - install the frontend dependencies' @echo 'build_frontend - build the frontend static files' - @echo 'build - build the frontend static files and package the project' \ No newline at end of file + @echo 'run_frontend - run the frontend in development mode' + @echo 'run_backend - run the backend in development mode' + @echo 'build - build the frontend static files and package the project' + @echo 'publish - build the frontend static files and package the project and publish it to PyPI' + @echo 'dev - run the project in development mode with docker compose' From 9840e3ff6d6b924c917ffdbfb82f55479a9ca18b Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Sun, 19 Mar 2023 21:54:23 -0300 Subject: [PATCH 3/3] fix: added gcc to dev.Dockerfile --- dev.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index b8a37bd4f..0f559a0cf 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -3,7 +3,7 @@ FROM python:3.10-slim WORKDIR /app # Install Poetry -RUN apt-get update && apt-get install -y curl +RUN apt-get update && apt-get install gcc curl -y RUN curl -sSL https://install.python-poetry.org | python3 - # # Add Poetry to PATH ENV PATH="${PATH}:/root/.local/bin"