Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.git
.env
.venv
__pycache__
*.pyc

.mypy_cache
.pytest_cache
.pytest_tmp
.ruff_cache
pytest_tmp

coverage
htmlcov
uploads
dev.db

frontend/node_modules
frontend/dist
frontend/coverage
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Type checking
run: |
poetry run mypy backend || true
poetry run mypy backend

- name: Run Alembic migrations and backend tests
env:
Expand All @@ -60,12 +60,12 @@ jobs:
working-directory: frontend
run: |
npm ci
npm run lint || true
npm run typecheck || true
npm run test -- --coverage || true
npm run build || true
npm run lint
npm run typecheck
npm run test -- --run --coverage
npm run build

- name: Build Docker images
run: |
docker build -f ./backend/Dockerfile -t dip-backend .
docker build -t dip-frontend ./frontend
docker build -f ./frontend/Dockerfile -t dip-frontend .
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /app
COPY pyproject.toml poetry.lock* /app/
RUN apt-get update && apt-get install -y --no-install-recommends gcc libpq-dev && rm -rf /var/lib/apt/lists/*
RUN pip install poetry && poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi
COPY backend /app
COPY backend /app/backend
COPY alembic.ini /app/
COPY alembic /app/alembic
COPY backend/docker-entrypoint.sh /app/docker-entrypoint.sh
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ services:
retries: 5

frontend:
build: ./frontend
build:
context: .
dockerfile: frontend/Dockerfile
ports:
- '3000:3000'
depends_on:
Expand Down
6 changes: 3 additions & 3 deletions scripts/verify.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ Push-Location frontend

# Find npm command on Windows (npm or npm.cmd) or Unix (npm)
$npmCmd = $null
if (Get-Command 'npm' -ErrorAction SilentlyContinue) {
$npmCmd = 'npm'
} elseif (Get-Command 'npm.cmd' -ErrorAction SilentlyContinue) {
if (Get-Command 'npm.cmd' -ErrorAction SilentlyContinue) {
$npmCmd = 'npm.cmd'
} elseif (Get-Command 'npm' -ErrorAction SilentlyContinue) {
$npmCmd = 'npm'
} else {
Write-Host 'npm is not installed or not on PATH. Please install Node.js LTS and ensure npm is on PATH, then rerun verification.'
Pop-Location
Expand Down
Loading