Compare commits

..

10 Commits

Author SHA1 Message Date
cc14322c12 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.
2026-04-02 18:50:50 +03:00
4e8300f6f0 Refactor CI workflow to improve container readiness check and remove pip caching step
All checks were successful
CI/CD / test-backend (pull_request) Successful in 7s
CI/CD / test-frontend (pull_request) Successful in 9s
CI/CD / build-and-deploy (pull_request) Successful in 1m4s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
- Replaced the pip caching step with a direct installation of dependencies.
- Enhanced the container readiness check by implementing a timeout mechanism that waits for application startup logs instead of a fixed number of attempts.
2026-04-02 18:35:27 +03:00
b64d49ddaa Update Dockerfile to reference requirements from the api directory
Some checks failed
CI/CD / test-backend (pull_request) Successful in 30s
CI/CD / test-frontend (pull_request) Successful in 9s
CI/CD / build-and-deploy (pull_request) Failing after 2m0s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 18:22:42 +03:00
8616f59c95 docker fix
Some checks failed
CI/CD / test-backend (pull_request) Successful in 30s
CI/CD / test-frontend (pull_request) Successful in 10s
CI/CD / build-and-deploy (pull_request) Failing after 32s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 18:18:25 +03:00
edb83e0fad cache test
Some checks failed
CI/CD / test-backend (pull_request) Successful in 1m25s
CI/CD / test-frontend (pull_request) Successful in 9s
CI/CD / pr-status (pull_request) Has been cancelled
CI/CD / build-and-deploy (pull_request) Has been cancelled
2026-04-02 18:15:01 +03:00
1ccdd8c66a fix cd
Some checks failed
CI/CD / test-backend (pull_request) Successful in 7s
CI/CD / test-frontend (pull_request) Successful in 10s
CI/CD / build-and-deploy (pull_request) Failing after 1m45s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 17:43:45 +03:00
34640858d8 fix dockerfile
Some checks failed
CI/CD / test-backend (pull_request) Successful in 7s
CI/CD / test-frontend (pull_request) Successful in 10s
CI/CD / build-and-deploy (pull_request) Failing after 41s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 17:30:26 +03:00
3359d088e9 add dockerfile
Some checks failed
CI/CD / test-backend (pull_request) Successful in 7s
CI/CD / test-frontend (pull_request) Successful in 9s
CI/CD / build-and-deploy (pull_request) Failing after 15s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 17:28:32 +03:00
8874cea21d fix registry login
Some checks failed
CI/CD / test-backend (pull_request) Successful in 9s
CI/CD / test-frontend (pull_request) Successful in 10s
CI/CD / build-and-deploy (pull_request) Failing after 16s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 17:14:48 +03:00
c185b62441 test build and deploy
Some checks failed
CI/CD / test-backend (pull_request) Successful in 7s
CI/CD / test-frontend (pull_request) Successful in 9s
CI/CD / build-and-deploy (pull_request) Failing after 2m38s
CI/CD Pipeline / Overall Status ✅ Все проверки прошли успешно
CI/CD / pr-status (pull_request) Successful in 1s
2026-04-02 17:10:21 +03:00
2 changed files with 98 additions and 0 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
@@ -53,6 +59,82 @@ jobs:
run: | run: |
cd web cd web
npm run build npm run build
build-and-deploy:
needs: test-backend
runs-on: ubuntu-latest
if: success() # Запускается только если тесты прошли успешно
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to container registry
uses: docker/login-action@v3
with:
registry: git.rlkdev.ru # Замените на ваш Gitea registry
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
- name: Cache Docker layers
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ hashFiles('api/requirements.txt') }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: .
push: false
load: true
tags: fastapi-app:latest
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
- name: Stop and remove old container
run: |
docker stop fastapi-container || true
docker rm fastapi-container || true
- name: Run new container
run: |
docker run -d \
--name fastapi-container \
-p 8080:8000 \
--restart unless-stopped \
fastapi-app:latest
- name: Wait for container to be ready
run: |
timeout=60
interval=2
elapsed=0
while [ $elapsed -lt $timeout ]; do
if docker logs fastapi-container 2>&1 | grep -q "Application startup complete"; then
echo "Application startup detected in logs"
echo "Deployment successful!"
exit 0
fi
echo "Waiting for startup log... ($elapsed/$timeout sec)"
sleep $interval
elapsed=$((elapsed + interval))
done
echo "Timeout: Application startup not detected in logs"
docker logs fastapi-container
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:

16
Dockerfile Normal file
View File

@@ -0,0 +1,16 @@
FROM python:3.11-slim
WORKDIR /app
# 1. Копируем только файл с зависимостями (меняется редко)
COPY api/requirements.txt requirements.txt
# 2. Устанавливаем зависимости (слой кэшируется, пока не изменился requirements.txt)
RUN pip install --no-cache-dir -r requirements.txt
# 3. Копируем весь остальной код (меняется часто)
COPY api/ api/
EXPOSE 8000
CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "8000"]