From 27e01d010f0e2b9d5e0a0cd88a1671f464cf8b49 Mon Sep 17 00:00:00 2001
From: Denozordec <shatskiy.blog@gmail.com>
Date: Tue, 19 May 2026 10:50:05 +0700
Subject: [PATCH] refactor: update Docker build variable syntax in CI
 configuration and documentation

Changed the variable assignment syntax in the CI workflow from `--set` to `--var` for Docker build commands. Updated the README to reflect this change and clarify the usage of variables in the docker-bake.hcl file.
---
 .gitea/workflows/ci.yaml | 28 ++++++++++++++--------------
 deploy/docker/README.md  | 10 +++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 6d118d6..ab5a4e2 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"
+            --var "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --var "IMAGE_TAG=latest" \
+            --var "SHORT_SHA=${SHORT_SHA}" \
+            --var "SHA_FULL=${{ github.sha }}" \
+            --var "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"
+            --var "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --var "IMAGE_TAG=latest" \
+            --var "SHORT_SHA=${SHORT_SHA}" \
+            --var "SHA_FULL=${{ github.sha }}" \
+            --var "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 }}"
+            --var "REGISTRY=git.shts.su/${OWNER_LC}" \
+            --var "IMAGE_TAG=latest" \
+            --var "SHORT_SHA=${SHORT_SHA}" \
+            --var "SHA_FULL=${{ github.sha }}"
diff --git a/deploy/docker/README.md b/deploy/docker/README.md
index 59d9167..1be88df 100644
--- a/deploy/docker/README.md
+++ b/deploy/docker/README.md
@@ -25,14 +25,14 @@
 ```bash
 cd deploy/docker
 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)"
+  --var "REGISTRY=git.shts.su/<owner>" \
+  --var "IMAGE_TAG=latest" \
+  --var "SHORT_SHA=$(git rev-parse --short HEAD)"
 docker buildx bake -f docker-bake.hcl web-images \
-  --set "REGISTRY=git.shts.su/<owner>"
+  --var "REGISTRY=git.shts.su/<owner>"
 ```
 
-Переменные из `variable` в `docker-bake.hcl` задаются **без** префикса `*.` (например `REGISTRY=…`, не `*.REGISTRY=…`).
+Переменные из `variable` в `docker-bake.hcl` передаются флагом **`--var NAME=value`** (не `--set`: он только для полей target вроде `tags`, `args`).
 
 Один образ (legacy):