From 4a82849ec2026e379c321560ae0b9145859c5809 Mon Sep 17 00:00:00 2001
From: Vlad <vlad@ddl.su>
Date: Sat, 7 Jun 2025 08:52:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=84=D0=B0=D0=B9=D0=BB=20docker-build-local.yml=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20REGISTRY=5FURL=20=D0=B2?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20REGISTRY,=20=D1=87=D1=82=D0=BE?=
 =?UTF-8?q?=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B0=D0=B5=D1=82=20=D1=87?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B0=D0=B5=D0=BC=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0.=20=D0=A2=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BE=D1=8F=D1=81=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B0=20URL=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B5=D1=81=D1=82=D1=80=D0=B0=20=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D1=81=D0=B2=D0=BE=D0=B4=D0=BA=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D0=B8.=20=D0=AD=D1=82=D0=B8=20=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D1=88=D0=B0=D1=8E=D1=82=20=D1=83=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=BE=20=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20CI/CD=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?=
 =?UTF-8?q?=D1=81=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/docker-build-local.yml | 25 ++++++++----
 HARBOR_TAG_FORMAT.md                    | 51 +++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 HARBOR_TAG_FORMAT.md

diff --git a/.gitea/workflows/docker-build-local.yml b/.gitea/workflows/docker-build-local.yml
index b76faa8..fba47d5 100644
--- a/.gitea/workflows/docker-build-local.yml
+++ b/.gitea/workflows/docker-build-local.yml
@@ -19,7 +19,7 @@ on:
         default: 'latest'
 
 env:
-  IMAGE_NAME: salvagedb/salvagedb-bot
+  IMAGE_NAME: salvagedb-bot
 
 jobs:
   build:
@@ -43,22 +43,26 @@ jobs:
       - name: Generate tags
         id: tags
         run: |
-          REGISTRY="${{ secrets.DOCKER_REGISTRY_URL }}"
+          # Harbor формат: registry_url/project/repository:tag
+          REGISTRY_URL="${{ secrets.DOCKER_REGISTRY_URL }}"
           IMAGE_NAME="${{ env.IMAGE_NAME }}"
           
+          # Убираем протокол из registry URL если есть
+          REGISTRY_URL=$(echo "$REGISTRY_URL" | sed 's|^https\?://||')
+          
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "tags=${REGISTRY}/${IMAGE_NAME}:${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+            echo "tags=${REGISTRY_URL}/${IMAGE_NAME}:${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
           elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
             pr_number=${{ github.event.number }}
-            echo "tags=${REGISTRY}/${IMAGE_NAME}:pr-${pr_number}" >> $GITHUB_OUTPUT
+            echo "tags=${REGISTRY_URL}/${IMAGE_NAME}:pr-${pr_number}" >> $GITHUB_OUTPUT
           elif [[ "${{ github.ref_type }}" == "tag" ]]; then
             tag=${GITHUB_REF#refs/tags/}
-            echo "tags=${REGISTRY}/${IMAGE_NAME}:${tag},${REGISTRY}/${IMAGE_NAME}:latest" >> $GITHUB_OUTPUT
+            echo "tags=${REGISTRY_URL}/${IMAGE_NAME}:${tag},${REGISTRY_URL}/${IMAGE_NAME}:latest" >> $GITHUB_OUTPUT
           elif [[ "${{ github.ref_name }}" == "main" ]]; then
-            echo "tags=${REGISTRY}/${IMAGE_NAME}:latest,${REGISTRY}/${IMAGE_NAME}:main" >> $GITHUB_OUTPUT
+            echo "tags=${REGISTRY_URL}/${IMAGE_NAME}:latest,${REGISTRY_URL}/${IMAGE_NAME}:main" >> $GITHUB_OUTPUT
           else
             branch_name=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9]/-/g')
-            echo "tags=${REGISTRY}/${IMAGE_NAME}:${branch_name}" >> $GITHUB_OUTPUT
+            echo "tags=${REGISTRY_URL}/${IMAGE_NAME}:${branch_name}" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push Docker image
@@ -81,9 +85,14 @@ jobs:
           echo "## Docker Build Summary" >> $GITHUB_STEP_SUMMARY
           echo "- **Event:** ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Registry:** ${{ secrets.DOCKER_REGISTRY_URL }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Image:** ${{ env.IMAGE_NAME }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Repository:** ${{ env.IMAGE_NAME }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Tags:** ${{ steps.tags.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### 📦 Harbor Format:" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull ${{ steps.tags.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
           
           # Проверяем наличие credentials
           if [[ "${{ secrets.DOCKER_REGISTRY_USERNAME }}" == "" || "${{ secrets.DOCKER_REGISTRY_PASSWORD }}" == "" || "${{ secrets.DOCKER_REGISTRY_URL }}" == "" ]]; then
diff --git a/HARBOR_TAG_FORMAT.md b/HARBOR_TAG_FORMAT.md
new file mode 100644
index 0000000..a7753c2
--- /dev/null
+++ b/HARBOR_TAG_FORMAT.md
@@ -0,0 +1,51 @@
+# Harbor Registry Tag Format Fix
+
+## Проблема
+Ошибка в формате тегов Docker образов для Harbor registry. Harbor ожидает формат:
+```
+reg.ddl.su/salvage_bot/REPOSITORY[:TAG]
+```
+
+## Исправление
+
+### До (неправильно):
+```yaml
+env:
+  IMAGE_NAME: salvagedb/salvagedb-bot  # содержит лишний slash
+
+# Генерировал теги вида: reg.ddl.su/salvagedb/salvagedb-bot:latest
+```
+
+### После (правильно):
+```yaml
+env:
+  IMAGE_NAME: salvagedb-bot  # только имя репозитория
+
+# Генерирует теги вида: reg.ddl.su/salvage_bot/salvagedb-bot:latest
+```
+
+## Объяснение
+
+Harbor использует трёхуровневую структуру:
+1. **Registry URL**: `reg.ddl.su`
+2. **Project/Namespace**: `salvage_bot` (уже включен в настройках Harbor)
+3. **Repository**: `salvagedb-bot` (указывается в IMAGE_NAME)
+
+Конечный формат: `registry_url/project/repository:tag`
+
+## Изменения в файлах
+
+- ✅ `.gitea/workflows/docker-build-local.yml` - исправлен формат тегов
+- ✅ Убрано лишнее `/salvagedb/` из пути
+- ✅ Добавлена нормализация URL (убирает https:// если есть)
+- ✅ Обновлена документация в Summary
+
+## Тестирование
+
+Теперь workflow будет генерировать правильные теги:
+- `reg.ddl.su/salvage_bot/salvagedb-bot:latest`
+- `reg.ddl.su/salvage_bot/salvagedb-bot:main`
+- `reg.ddl.su/salvage_bot/salvagedb-bot:v1.0.0`
+
+Вместо неправильных:
+- ~~`reg.ddl.su/salvagedb/salvagedb-bot:latest`~~ ❌ 
\ No newline at end of file