fix: update Docker build commands in CI configuration and documentation
CI / changes (push) Successful in 6s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 21s
CI / docker-web (push) Failing after 13s
CI / docker-bird (push) Failing after 14s
CI / bird2 (push) Successful in 13s
CI / docker-go (push) Failing after 13s
CI / changes (push) Successful in 6s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 21s
CI / docker-web (push) Failing after 13s
CI / docker-bird (push) Failing after 14s
CI / bird2 (push) Successful in 13s
CI / docker-go (push) Failing after 13s
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.
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"
|
||||
--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 }}"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user