diff --git a/.github/workflows/docker-registry.yml b/.github/workflows/docker-registry.yml index 66c31e23..aad33af9 100644 --- a/.github/workflows/docker-registry.yml +++ b/.github/workflows/docker-registry.yml @@ -1,20 +1,21 @@ name: Build and Publish Docker Image + on: push: branches: - main - - master - dev tags: - 'v*' pull_request: branches: - main - - master - dev + env: REGISTRY: ghcr.io IMAGE_NAME: fr1ngg/remnawave-bedolaga-telegram-bot + jobs: build-and-push: runs-on: ubuntu-latest @@ -24,14 +25,47 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Log in to Container Registry uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + + - name: Get version info + id: version + run: | + echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT + + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/} + echo "🏷️ Собираем релизную версию: $VERSION" + elif [[ $GITHUB_REF == refs/heads/main ]]; then + VERSION="v2.2.3-$(git rev-parse --short HEAD)" + echo "🚀 Собираем версию из main: $VERSION" + elif [[ $GITHUB_REF == refs/heads/dev ]]; then + VERSION="v2.2.3-dev-$(git rev-parse --short HEAD)" + echo "🧪 Собираем dev версию: $VERSION" + else + VERSION="v2.2.3-pr-$(git rev-parse --short HEAD)" + echo "🔀 Собираем PR версию: $VERSION" + fi + echo "version=$VERSION" >> $GITHUB_OUTPUT + + echo "=== Информация о сборке ===" + echo "Версия: $VERSION" + echo "Коммит: $(git rev-parse --short HEAD)" + echo "Ветка/Тег: $GITHUB_REF" + echo "===========================" + - name: Extract metadata id: meta uses: docker/metadata-action@v5 @@ -45,6 +79,8 @@ jobs: type=semver,pattern={{major}} type=raw,value=latest,enable={{is_default_branch}} type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} + type=raw,value=${{ steps.version.outputs.version }} + - name: Build and push Docker image uses: docker/build-push-action@v5 with: @@ -54,8 +90,13 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + VERSION=${{ steps.version.outputs.version }} + BUILD_DATE=${{ steps.version.outputs.build_date }} + VCS_REF=${{ steps.version.outputs.short_sha }} cache-from: type=gha cache-to: type=gha,mode=max + - name: Generate security report uses: docker/scout-action@v1 if: github.event_name == 'pull_request' @@ -67,3 +108,22 @@ jobs: only-severities: critical,high write-comment: true github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Summary + if: github.event_name != 'pull_request' + run: | + echo "## 🚀 Docker Build Summary" >> $GITHUB_STEP_SUMMARY + echo "| Параметр | Значение |" >> $GITHUB_STEP_SUMMARY + echo "|----------|----------|" >> $GITHUB_STEP_SUMMARY + echo "| **Версия** | \`${{ steps.version.outputs.version }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Коммит** | \`${{ steps.version.outputs.short_sha }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Дата сборки** | \`${{ steps.version.outputs.build_date }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Registry** | \`${{ env.REGISTRY }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Образ** | \`${{ env.IMAGE_NAME }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Ветка** | \`${{ github.ref_name }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Статус** | ✅ Опубликован |" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### 📋 Доступные теги:" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY + echo "${{ steps.meta.outputs.tags }}" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY