refactor: update Docker build variable syntax in CI configuration and documentation
CI / changes (push) Successful in 6s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 22s
CI / docker-web (push) Failing after 14s
CI / docker-bird (push) Failing after 14s
CI / bird2 (push) Successful in 14s
CI / docker-go (push) Failing after 14s
CI / changes (push) Successful in 6s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 22s
CI / docker-web (push) Failing after 14s
CI / docker-bird (push) Failing after 14s
CI / bird2 (push) Successful in 14s
CI / docker-go (push) Failing after 14s
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.
This commit is contained in:
+14
-14
@@ -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 }}"
|
||||
|
||||
@@ -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):
|
||||
|
||||
|
||||
Reference in New Issue
Block a user