upd deploy for workflow
This commit is contained in:
parent
e6e700c2ee
commit
928c686801
1 changed files with 11 additions and 12 deletions
|
|
@ -11,7 +11,7 @@ on:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: ${{ secrets.REGISTRY_URL || 'forgejo.example.com' }}
|
# Для Docker Hub REGISTRY не нужен - оставляем пустым
|
||||||
IMAGE_NAME: ${{ secrets.IMAGE_NAME || 'flask-app' }}
|
IMAGE_NAME: ${{ secrets.IMAGE_NAME || 'flask-app' }}
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
||||||
|
|
@ -27,7 +27,7 @@ jobs:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.14'
|
python-version: '3.9' # Исправил на 3.9, т.к. 3.14 еще нет
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -57,12 +57,12 @@ jobs:
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Log in to registry
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ${{ env.REGISTRY }}
|
|
||||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
# registry не указываем - по умолчанию Docker Hub
|
||||||
|
|
||||||
- name: Get commit hash
|
- name: Get commit hash
|
||||||
id: vars
|
id: vars
|
||||||
|
|
@ -77,9 +77,9 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
|
${{ env.IMAGE_NAME }}:latest
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.vars.outputs.IMAGE_TAG }}
|
${{ env.IMAGE_NAME }}:${{ steps.vars.outputs.IMAGE_TAG }}
|
||||||
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.run_number }}
|
${{ env.IMAGE_NAME }}:${{ github.run_number }}
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
cache-to: type=gha,mode=max
|
cache-to: type=gha,mode=max
|
||||||
build-args: |
|
build-args: |
|
||||||
|
|
@ -111,7 +111,6 @@ jobs:
|
||||||
|
|
||||||
# Переменные для деплоя
|
# Переменные для деплоя
|
||||||
APP_NAME="flask-app"
|
APP_NAME="flask-app"
|
||||||
REGISTRY="${{ env.REGISTRY }}"
|
|
||||||
IMAGE_NAME="${{ env.IMAGE_NAME }}"
|
IMAGE_NAME="${{ env.IMAGE_NAME }}"
|
||||||
CONTAINER_NAME="flask-app"
|
CONTAINER_NAME="flask-app"
|
||||||
PORT=5000
|
PORT=5000
|
||||||
|
|
@ -123,9 +122,9 @@ jobs:
|
||||||
mkdir -p $DEPLOY_DIR
|
mkdir -p $DEPLOY_DIR
|
||||||
cd $DEPLOY_DIR
|
cd $DEPLOY_DIR
|
||||||
|
|
||||||
# Загружаем последний образ
|
# Загружаем последний образ (без REGISTRY, т.к. Docker Hub по умолчанию)
|
||||||
echo "📦 Загружаем Docker образ..."
|
echo "📦 Загружаем Docker образ с Docker Hub..."
|
||||||
docker pull $REGISTRY/$IMAGE_NAME:latest
|
docker pull $IMAGE_NAME:latest
|
||||||
|
|
||||||
# Останавливаем и удаляем старый контейнер
|
# Останавливаем и удаляем старый контейнер
|
||||||
echo "🔄 Перезапускаем контейнер..."
|
echo "🔄 Перезапускаем контейнер..."
|
||||||
|
|
@ -142,7 +141,7 @@ jobs:
|
||||||
-e COMMIT_HASH="${{ github.sha }}" \
|
-e COMMIT_HASH="${{ github.sha }}" \
|
||||||
-e FLASK_ENV=production \
|
-e FLASK_ENV=production \
|
||||||
-e SECRET_KEY="${{ secrets.APP_SECRET_KEY }}" \
|
-e SECRET_KEY="${{ secrets.APP_SECRET_KEY }}" \
|
||||||
$REGISTRY/$IMAGE_NAME:latest
|
$IMAGE_NAME:latest
|
||||||
|
|
||||||
# Проверяем здоровье
|
# Проверяем здоровье
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue