diff --git a/.github/workflows/docker-registry.yml b/.github/workflows/docker-registry.yml index 691f9642..d2dc4bd1 100644 --- a/.github/workflows/docker-registry.yml +++ b/.github/workflows/docker-registry.yml @@ -30,6 +30,9 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: | + network=host - name: Log in to Container Registry uses: docker/login-action@v3 @@ -42,7 +45,6 @@ jobs: 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 @@ -59,12 +61,6 @@ jobs: 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 @@ -86,7 +82,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -94,8 +90,14 @@ jobs: 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 + cache-from: | + type=gha + type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache + cache-to: | + type=gha,mode=max + type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max + build-contexts: | + alpine=docker-image://alpine:latest - name: Generate security report uses: docker/scout-action@v1 @@ -122,8 +124,3 @@ jobs: 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