From 2e65d803a23f4eaa3b6c35e6f50af50fc94c2500 Mon Sep 17 00:00:00 2001 From: Domingo Dirutigliano Date: Mon, 5 Jun 2023 09:22:11 +0200 Subject: [PATCH] updated changes from main branch --- .gitignore | 1 + Dockerfile | 4 ++-- README.md | 1 - backend/utils/loader.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d9e4882..d643585 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ /backend/modules/cppqueue /backend/modules/proxy docker-compose.yml +firegex-compose.yml # misc **/.DS_Store diff --git a/Dockerfile b/Dockerfile index bcc8142..cf80f5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ RUN mkdir /app WORKDIR /app ADD ./frontend/package.json . ADD ./frontend/yarn.lock . -RUN yarn install +RUN yarn install --network-timeout 300000 COPY ./frontend/ . -RUN yarn build +RUN yarn build --production=true #Building main conteiner diff --git a/README.md b/README.md index 99025e1..4f616bd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # 2.2.0 VERSION NEW TO IMPLEMENT - TODO: Need to fix mantine form validation -- TODO: Merge edits in the main branch to this branch 1. PCRE2 ---> HyperScan Streams (VectorScan for arm64 compatibility using debian Bookworm) 2. nfregex from c++ to rust - https://crates.io/crates/hyperscan diff --git a/backend/utils/loader.py b/backend/utils/loader.py index d60c217..5bbe676 100644 --- a/backend/utils/loader.py +++ b/backend/utils/loader.py @@ -14,7 +14,7 @@ REACT_HTML_PATH: str = os.path.join(REACT_BUILD_DIR,"index.html") async def frontend_debug_proxy(path): httpc = httpx.AsyncClient() - req = httpc.build_request("GET",f"http://127.0.0.1:{os.getenv('F_PORT','3000')}/"+path) + req = httpc.build_request("GET",f"http://127.0.0.1:{os.getenv('F_PORT','5173')}/"+path) resp = await httpc.send(req, stream=True) return StreamingResponse(resp.aiter_bytes(),status_code=resp.status_code) @@ -38,7 +38,7 @@ def frontend_deploy(app): @app.websocket("/ws") async def websocket_debug_proxy(ws: WebSocket): await ws.accept() - async with websockets.connect(f"ws://127.0.0.1:{os.getenv('F_PORT','3000')}/ws") as ws_b_client: + async with websockets.connect(f"ws://127.0.0.1:{os.getenv('F_PORT','5173')}/ws") as ws_b_client: fwd_task = asyncio.create_task(forward_websocket(ws, ws_b_client)) rev_task = asyncio.create_task(reverse_websocket(ws, ws_b_client)) await asyncio.gather(fwd_task, rev_task) @@ -49,7 +49,7 @@ def frontend_deploy(app): try: return await frontend_debug_proxy(full_path) except Exception: - return {"details":"Frontend not started at "+f"http://127.0.0.1:{os.getenv('F_PORT','3000')}"} + return {"details":"Frontend not started at "+f"http://127.0.0.1:{os.getenv('F_PORT','5173')}"} else: return await react_deploy(full_path) def list_routers():