From b5061a58d9370913ca1f0de18084d719641334ca Mon Sep 17 00:00:00 2001
From: Denozordec <shatskiy.blog@gmail.com>
Date: Tue, 19 May 2026 10:48:09 +0700
Subject: [PATCH] fix: update Docker build commands in CI configuration and
 documentation

Refactored the Docker build commands in the CI workflow to remove the wildcard prefix from variable settings, ensuring proper variable assignment. Updated the README documentation to reflect these changes and provide clearer instructions for building images with the correct variable syntax.
---
 .gitea/workflows/ci.yaml | 28 ++++++++++++++--------------
 deploy/docker/README.md  | 10 ++++++++--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index c316a02..6d118d6 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -226,11 +226,11 @@ jobs:
           cd "${{ github.workspace }}/deploy/docker"
           docker buildx bake -f docker-bake.hcl go-images \
             --push \
-            --set "*.REGISTRY=git.shts.su/${OWNER_LC}" \
-            --set "*.IMAGE_TAG=latest" \
-            --set "*.SHORT_SHA=${SHORT_SHA}" \
-            --set "*.SHA_FULL=${{ github.sha }}" \
-            --set "*.CACHE_REF_GO=git.shts.su/${OWNER_LC}/evobgp-buildcache:go-buildcache"
+            --set "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --set "IMAGE_TAG=latest" \
+            --set "SHORT_SHA=${SHORT_SHA}" \
+            --set "SHA_FULL=${{ github.sha }}" \
+            --set "CACHE_REF_GO=git.shts.su/${OWNER_LC}/evobgp-buildcache:go-buildcache"
 
   # ---------------------------------------------------------------------------
   # Docker: Web (evobgp-web, evobgp-web-all) — один npm ci (кэш) + два nginx-тега.
@@ -269,11 +269,11 @@ jobs:
           cd "${{ github.workspace }}/deploy/docker"
           docker buildx bake -f docker-bake.hcl web-images \
             --push \
-            --set "*.REGISTRY=git.shts.su/${OWNER_LC}" \
-            --set "*.IMAGE_TAG=latest" \
-            --set "*.SHORT_SHA=${SHORT_SHA}" \
-            --set "*.SHA_FULL=${{ github.sha }}" \
-            --set "*.CACHE_REF_WEB=git.shts.su/${OWNER_LC}/evobgp-buildcache:web-buildcache"
+            --set "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --set "IMAGE_TAG=latest" \
+            --set "SHORT_SHA=${SHORT_SHA}" \
+            --set "SHA_FULL=${{ github.sha }}" \
+            --set "CACHE_REF_WEB=git.shts.su/${OWNER_LC}/evobgp-buildcache:web-buildcache"
 
   # ---------------------------------------------------------------------------
   # Docker: BIRD2 (evobgp-bird2).
@@ -313,7 +313,7 @@ jobs:
           cd "${{ github.workspace }}/deploy/docker"
           docker buildx bake -f docker-bake.hcl evobgp-bird2 \
             --push \
-            --set "*.REGISTRY=git.shts.su/${OWNER_LC}" \
-            --set "*.IMAGE_TAG=latest" \
-            --set "*.SHORT_SHA=${SHORT_SHA}" \
-            --set "*.SHA_FULL=${{ github.sha }}"
+            --set "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --set "IMAGE_TAG=latest" \
+            --set "SHORT_SHA=${SHORT_SHA}" \
+            --set "SHA_FULL=${{ github.sha }}"
diff --git a/deploy/docker/README.md b/deploy/docker/README.md
index e8975fe..59d9167 100644
--- a/deploy/docker/README.md
+++ b/deploy/docker/README.md
@@ -24,10 +24,16 @@
 
 ```bash
 cd deploy/docker
-docker buildx bake -f docker-bake.hcl go-images
-docker buildx bake -f docker-bake.hcl web-images
+docker buildx bake -f docker-bake.hcl go-images \
+  --set "REGISTRY=git.shts.su/<owner>" \
+  --set "IMAGE_TAG=latest" \
+  --set "SHORT_SHA=$(git rev-parse --short HEAD)"
+docker buildx bake -f docker-bake.hcl web-images \
+  --set "REGISTRY=git.shts.su/<owner>"
 ```
 
+Переменные из `variable` в `docker-bake.hcl` задаются **без** префикса `*.` (например `REGISTRY=…`, не `*.REGISTRY=…`).
+
 Один образ (legacy):
 
 ```bash