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