mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-09 05:25:14 +09:00
Myasnikov Daniil
a576f33461
`--cache-to type=inline` only exports the final stage. 25 of 38 Dockerfiles are multistage, so the expensive `builder` stages (Go/Node compiles) were never cached even with a warm tag. Switch every image to a shared mode=max registry cache. - New `cache-args` macro (hack/common-envs.mk) emits `--cache-from` always and `--cache-to … mode=max` only when WRITE_CACHE=1, so PR builds stay read-only and concurrent PRs never race on the cache ref (the 409 class #2711 fixed for tags). oci-mediatypes/image-manifest keep the cache manifest portable across registries. - Cache ref is CACHE_REGISTRY/<img>:buildcache, co-located with the build registry (CACHE_REGISTRY now defaults to $(REGISTRY)). - New build-main.yaml warms :buildcache on every push to main (WRITE_CACHE=1), serialized via concurrency. All 31 package image recipes converted from the inline cache-from/cache-to pair to `$(call cache-args,…)`; ubuntu-container-disk keeps a per-k8s-version cache tag. Verified with `make -n image` across all packages in both PR (read-only) and main (mode=max write) contexts. Part of #2937. Assisted-By: Claude <noreply@anthropic.com> Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
22 lines
719 B
Makefile
22 lines
719 B
Makefile
export NAME=kilo
|
|
export NAMESPACE=cozy-$(NAME)
|
|
|
|
include ../../../hack/common-envs.mk
|
|
include ../../../hack/package.mk
|
|
|
|
update:
|
|
sha=$$(git ls-remote https://github.com/squat/kilo refs/heads/main | awk '{print $$1}') && \
|
|
sed -i "/ARG VERSION/ s|=.*|=$${sha}|g" images/kilo/Dockerfile
|
|
|
|
image:
|
|
docker buildx build images/kilo \
|
|
$(call image-tags,kilo,v$(COZYSTACK_VERSION)) \
|
|
$(call cache-args,kilo) \
|
|
--metadata-file images/kilo.json \
|
|
$(BUILDX_ARGS)
|
|
REPOSITORY="$(REGISTRY)/kilo" \
|
|
yq -i '.kilo.image.repository = strenv(REPOSITORY)' values.yaml
|
|
TAG=$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kilo.json -o json -r) \
|
|
yq -i '.kilo.image.tag = strenv(TAG)' values.yaml
|
|
rm -f images/kilo.json
|