-
Notifications
You must be signed in to change notification settings - Fork 107
Staging #104
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Staging #104
Changes from all commits
7cf175f
26b616a
9fd9875
5e9ba19
101b012
701db7f
56b9c36
708de13
1b01b6a
e655e75
9c2029c
9d42263
c279334
890876a
61897fe
80d9315
349f937
c0639c7
5ce6dda
d7141a1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,6 @@ jobs: | |
| pipenv sync --dev | ||
|
|
||
| - name: Install frontend dependencies | ||
| if: "exists('app/package.json')" | ||
| run: | | ||
| node --version || true | ||
| npm --version || true | ||
|
|
@@ -51,21 +50,16 @@ jobs: | |
| - name: Create test environment file | ||
| run: | | ||
| cp .env.example .env | ||
| echo "FLASK_SECRET_KEY=test-secret-key" >> .env | ||
| echo "FLASK_DEBUG=False" >> .env | ||
| echo "FASTAPI_SECRET_KEY=test-secret-key" >> .env | ||
| echo "FASTAPI_DEBUG=False" >> .env | ||
|
|
||
| - name: Run unit tests | ||
| run: | | ||
| pipenv run pytest tests/ -k "not e2e" --verbose | ||
|
|
||
| - name: Run pylint | ||
| - name: Run lint | ||
| run: | | ||
| pipenv run pylint "$(git ls-files '*.py')" || true | ||
|
|
||
| - name: Run frontend lint | ||
| if: "exists('app/package.json')" | ||
| run: | | ||
| (cd app && npm run lint) | ||
| make lint | ||
|
|
||
|
Comment on lines
+60
to
63
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💡 Verification agent 🧩 Analysis chainConfirm make lint target exists and fails on issues Replacing direct pylint invocation with Run this to verify: 🏁 Script executed: #!/bin/bash
# Validate that a 'lint' target exists and is non-phony no-op.
rg -nP '^\s*lint\s*:' Makefile
# Show the command(s) it runs for quick inspection
rg -nA5 -P '^\s*lint\s*:' MakefileLength of output: 330 Ensure the The Makefile’s
🤖 Prompt for AI Agents |
||
| e2e-tests: | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -109,8 +103,8 @@ jobs: | |
| cp .env.example .env | ||
| echo "FALKORDB_HOST=localhost" >> .env | ||
| echo "FALKORDB_PORT=6379" >> .env | ||
| echo "FLASK_SECRET_KEY=test-secret-key-for-ci" >> .env | ||
| echo "FLASK_DEBUG=False" >> .env | ||
| echo "FASTAPI_SECRET_KEY=test-secret-key-for-ci" >> .env | ||
| echo "FASTAPI_DEBUG=False" >> .env | ||
|
|
||
| - name: Wait for FalkorDB | ||
| run: | | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,7 @@ | ||||||||||||||||||||||||||||
| # Use a single stage build with FalkorDB base image | ||||||||||||||||||||||||||||
| # Multi-stage build: Start with Python 3.12 base | ||||||||||||||||||||||||||||
| FROM python:3.12-bookworm as python-base | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Main stage: Use FalkorDB base and copy Python 3.12 | ||||||||||||||||||||||||||||
| FROM falkordb/falkordb:latest | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| ENV PYTHONUNBUFFERED=1 \ | ||||||||||||||||||||||||||||
|
|
@@ -7,12 +10,15 @@ ENV PYTHONUNBUFFERED=1 \ | |||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| USER root | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Install Python and pip, netcat for wait loop in start.sh | ||||||||||||||||||||||||||||
| # Copy Python 3.12 from the python base image | ||||||||||||||||||||||||||||
| COPY --from=python-base /usr/local /usr/local | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Install netcat for wait loop in start.sh | ||||||||||||||||||||||||||||
| RUN apt-get update && apt-get install -y \ | ||||||||||||||||||||||||||||
| python3 \ | ||||||||||||||||||||||||||||
| python3-pip \ | ||||||||||||||||||||||||||||
| netcat-openbsd \ | ||||||||||||||||||||||||||||
| && rm -rf /var/lib/apt/lists/* | ||||||||||||||||||||||||||||
| && rm -rf /var/lib/apt/lists/* \ | ||||||||||||||||||||||||||||
| && ln -sf /usr/local/bin/python3.12 /usr/bin/python3 \ | ||||||||||||||||||||||||||||
| && ln -sf /usr/local/bin/python3.12 /usr/bin/python | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
Comment on lines
17
to
22
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Install required tooling in one layer; add missing essentials and tighten apt flags We use curl later but it’s not installed. Also add ca-certificates and gnupg for NodeSource, and avoid recommends to keep the image smaller. Create python symlinks after installing. Apply: -RUN apt-get update && apt-get install -y \
- netcat-openbsd \
- && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ netcat-openbsd curl ca-certificates gnupg \
+ && rm -rf /var/lib/apt/lists/* \
&& ln -sf /usr/local/bin/python3.12 /usr/bin/python3 \
&& ln -sf /usr/local/bin/python3.12 /usr/bin/python📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||
| WORKDIR /app | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
|
@@ -25,6 +31,25 @@ COPY Pipfile Pipfile.lock ./ | |||||||||||||||||||||||||||
| # Install Python dependencies from Pipfile | ||||||||||||||||||||||||||||
| RUN PIP_BREAK_SYSTEM_PACKAGES=1 pipenv sync --system | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Install Node.js (Node 22) so we can build the frontend inside the image. | ||||||||||||||||||||||||||||
| # Use NodeSource setup script to get a recent Node version on Debian-based images. | ||||||||||||||||||||||||||||
| RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ | ||||||||||||||||||||||||||||
| && apt-get update && apt-get install -y nodejs \ | ||||||||||||||||||||||||||||
| && rm -rf /var/lib/apt/lists/* | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
Comment on lines
+34
to
+39
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion NodeSource setup lacks curl/gnupg/CA packages and repeats apt metadata The step will fail on images without curl/gnupg. Also collapse updates into one and use --no-install-recommends. Apply: -RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
- && apt-get update && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends nodejs \
+ && rm -rf /var/lib/apt/lists/*Note: This assumes curl/gnupg/ca-certificates were installed earlier (see previous comment). If you prefer fully self-contained step, include them here instead. 📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||
| # Copy only frontend package files so Docker can cache npm installs when | ||||||||||||||||||||||||||||
| # package.json / package-lock.json don't change. | ||||||||||||||||||||||||||||
| COPY app/package*.json ./app/ | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Install frontend dependencies (reproducible install using package-lock) | ||||||||||||||||||||||||||||
| RUN if [ -f ./app/package-lock.json ]; then \ | ||||||||||||||||||||||||||||
| npm --prefix ./app ci --no-audit --no-fund; \ | ||||||||||||||||||||||||||||
| elif [ -f ./app/package.json ]; then \ | ||||||||||||||||||||||||||||
| npm --prefix ./app install --no-audit --no-fund; \ | ||||||||||||||||||||||||||||
| else \ | ||||||||||||||||||||||||||||
| echo "No frontend package.json found, skipping npm install"; \ | ||||||||||||||||||||||||||||
| fi | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Copy application code | ||||||||||||||||||||||||||||
| COPY . . | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
|
@@ -34,6 +59,5 @@ RUN chmod +x /start.sh | |||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| EXPOSE 5000 6379 3000 | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| # Use start.sh as entrypoint | ||||||||||||||||||||||||||||
| ENTRYPOINT ["/start.sh"] | ||||||||||||||||||||||||||||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add FASTAPI_DEBUG to the template for consistency with api/index.py and CI.
api/index.pyreadsFASTAPI_DEBUG, and CI appends it. Include it here so local setups don’t miss it.# FASTAPI configuration FASTAPI_SECRET_KEY=your_super_secret_key_here +FASTAPI_DEBUG=False # set to True to enable auto-reload in dev📝 Committable suggestion
🤖 Prompt for AI Agents