Refactor Dockerfile and CI workflow for improved dependency management and cleanup
All checks were successful
CI/CD / test-backend (pull_request) Successful in 30s
CI/CD / test-frontend (pull_request) Successful in 11s
CI/CD / build-and-deploy (pull_request) Successful in 5m38s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s

- Updated Dockerfile to optimize layer caching by copying requirements.txt before application code.
- Added caching for pip packages in CI workflow to speed up dependency installation.
- Implemented cleanup of dangling Docker images post-deployment.
This commit is contained in:
2026-04-02 18:50:50 +03:00
parent 4e8300f6f0
commit cc14322c12
2 changed files with 20 additions and 16 deletions

View File

@@ -20,6 +20,12 @@ jobs:
with: with:
python-version: '3.11' python-version: '3.11'
- name: Cache pip packages
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('api/requirements.txt') }}
- name: Установка зависимостей - name: Установка зависимостей
run: | run: |
cd api cd api
@@ -112,6 +118,7 @@ jobs:
while [ $elapsed -lt $timeout ]; do while [ $elapsed -lt $timeout ]; do
if docker logs fastapi-container 2>&1 | grep -q "Application startup complete"; then if docker logs fastapi-container 2>&1 | grep -q "Application startup complete"; then
echo "Application startup detected in logs" echo "Application startup detected in logs"
echo "Deployment successful!"
exit 0 exit 0
fi fi
echo "Waiting for startup log... ($elapsed/$timeout sec)" echo "Waiting for startup log... ($elapsed/$timeout sec)"
@@ -120,9 +127,15 @@ jobs:
done done
echo "Timeout: Application startup not detected in logs" echo "Timeout: Application startup not detected in logs"
docker logs fastapi-container docker logs fastapi-container
echo "Deployment successful!"
exit 1 exit 1
- name: Clean up dangling images
run: |
echo "Removing old dangling images..."
docker image prune -f
echo "Current images after cleanup:"
docker images
# Явный статус для PR # Явный статус для PR
pr-status: pr-status:
needs: [test-backend, test-frontend] needs: [test-backend, test-frontend]

View File

@@ -2,24 +2,15 @@ FROM python:3.11-slim
WORKDIR /app WORKDIR /app
# Установка системных зависимостей # 1. Копируем только файл с зависимостями (меняется редко)
# RUN apt-get update && apt-get install -y \ COPY api/requirements.txt requirements.txt
# gcc \
# && rm -rf /var/lib/apt/lists/*
# Копирование кода приложения # 2. Устанавливаем зависимости (слой кэшируется, пока не изменился requirements.txt)
RUN pip install --no-cache-dir -r requirements.txt
# 3. Копируем весь остальной код (меняется часто)
COPY api/ api/ COPY api/ api/
# Копирование зависимостей
# COPY requirements.txt .
RUN pip install --no-cache-dir -r api/requirements.txt
# Создание непривилегированного пользователя
# RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app
# USER appuser
# Открытие порта
EXPOSE 8000 EXPOSE 8000
# Команда для запуска приложения
CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "8000"] CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "8000"]