diff --git a/backend/Dockerfile b/backend/Dockerfile index cdeabfe..82ee1d5 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,10 +1,12 @@ -FROM python:3.11-slim +FROM python:3.14-slim WORKDIR /app ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 -RUN apt-get update && apt-get install -y --no-install-recommends build-essential libpq-dev tzdata && rm -rf /var/lib/apt/lists/* +RUN apt-get update +RUN apt-get install -y --no-install-recommends build-essential libpq-dev tzdata +RUN rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/requirements.txt RUN pip install --no-cache-dir -r requirements.txt diff --git a/backend/requirements.txt b/backend/requirements.txt index 9d37e95..454aeb7 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,16 +1,16 @@ -fastapi==0.111.0 -uvicorn[standard]==0.30.0 -SQLAlchemy==2.0.30 -psycopg2-binary==2.9.9 -alembic==1.13.1 -python-multipart==0.0.9 -pydantic==2.7.4 -bcrypt==3.2.2 +fastapi==0.136.1 +uvicorn[standard]==0.46.0 +SQLAlchemy==2.0.49 +psycopg2-binary==2.9.12 +alembic==1.18.4 +python-multipart==0.0.26 +pydantic==2.13.3 +bcrypt<5.0.0 passlib[bcrypt]==1.7.4 -python-jose==3.3.0 -email-validator==2.2.0 -cryptography==42.0.5 -jinja2==3.1.4 +python-jose==3.5.0 +email-validator==2.3.0 +cryptography==46.0.7 +jinja2==3.1.6 rstr==3.2.2 openpyxl==3.1.5 -tzdata>=2024.1 \ No newline at end of file +tzdata>=2024.1 diff --git a/db/Dockerfile b/db/Dockerfile index 3a4184f..f921df6 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:15-alpine +FROM postgres:18-alpine RUN apk add --no-cache tzdata diff --git a/docker-compose.yml b/docker-compose.yml index b3e1adc..57e955f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: db: build: @@ -10,9 +9,9 @@ services: - POSTGRES_PASSWORD=${DB_PASSWORD} - TZ=${SCHEDULER_TIMEZONE} volumes: - - pgdata:/var/lib/postgresql/data - ports: - - "5432:5432" + - pgdata:/var/lib/postgresql/18/docker + expose: + - "5432" healthcheck: test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"] interval: 5s @@ -30,8 +29,8 @@ services: depends_on: db: condition: service_healthy - ports: - - "8000:8000" + expose: + - "8000" frontend: build: diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0c55d99..9ffc889 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS build +FROM node:24-alpine AS build WORKDIR /usr/src/app COPY package.json package-lock.json* ./ RUN npm install diff --git a/start.sh b/start.sh index 4cd0f26..c4a8e03 100644 --- a/start.sh +++ b/start.sh @@ -32,4 +32,4 @@ docker compose up -d --build echo "" echo "[+] Tangled available at http://0.0.0.0:8080" -echo "" \ No newline at end of file +echo ""