Compare commits
3 Commits
fix
...
8378ec1b3e
| Author | SHA1 | Date | |
|---|---|---|---|
| 8378ec1b3e | |||
| 9d4fc2cff5 | |||
| 6655811cc1 |
@@ -20,12 +20,6 @@ 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
|
||||||
@@ -60,81 +54,22 @@ jobs:
|
|||||||
cd web
|
cd web
|
||||||
npm run build
|
npm run build
|
||||||
|
|
||||||
build-and-deploy:
|
# create-archives:
|
||||||
needs: test-backend
|
# needs: [test-backend, test-frontend]
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
if: success() # Запускается только если тесты прошли успешно
|
# if: github.event_name == 'workflow_dispatch' && always()
|
||||||
|
# steps:
|
||||||
|
# - name: Проверка кода
|
||||||
|
# uses: actions/checkout@v4
|
||||||
|
|
||||||
steps:
|
# - name: Загрузка артифакта
|
||||||
- name: Checkout code
|
# uses: actions/upload-artifact@v3
|
||||||
uses: actions/checkout@v4
|
# with:
|
||||||
|
# name: build-artifacts-${{ github.run_id }}
|
||||||
- name: Set up Docker Buildx
|
# path: |
|
||||||
uses: docker/setup-buildx-action@v3
|
# api/
|
||||||
|
# web/
|
||||||
- name: Log in to container registry
|
# retention-days: 7
|
||||||
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: git.rlkdev.ru/rlk/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-test-container || true
|
|
||||||
docker rm fastapi-test-container || true
|
|
||||||
|
|
||||||
- name: Run new container
|
|
||||||
run: |
|
|
||||||
docker run -d \
|
|
||||||
--name fastapi-test-container \
|
|
||||||
-p 8080:8000 \
|
|
||||||
--restart unless-stopped \
|
|
||||||
git.rlkdev.ru/rlk/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-test-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
16
Dockerfile
@@ -1,16 +0,0 @@
|
|||||||
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", "--root-path", "/python-common-app"]
|
|
||||||
Reference in New Issue
Block a user