mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-03 02:27:01 +09:00
Andrey Kolkov
647407545d
The Altinity and RabbitMQ strategy Pods ran platform-migrations, a 349 MB image carrying kubectl, helm and etcd-migrate whose ENTRYPOINT is the migration runner, and whose pins were stamped from packages/core/platform so every migration change moved the backup clients too. Build images/backup-http-client (alpine + curl + jq + ca-certificates, non-root) from this package's Makefile and stamp both client keys from it. The cross-package stamp in packages/core/platform/Makefile and the platform-migrations-specific check in hack/image-pin-consistency.bats go away; the general one-digest-per-repository check still covers the two keys sharing one image. Fixes #3420 Assisted-by: LLM Signed-off-by: Andrey Kolkov <androndo@gmail.com>
51 lines
2.5 KiB
Makefile
51 lines
2.5 KiB
Makefile
NAME=backupstrategy-controller
|
|
NAMESPACE=cozy-backup-controller
|
|
|
|
include ../../../hack/common-envs.mk
|
|
include ../../../hack/package.mk
|
|
|
|
# PHONY so a stray file/dir named `image` cannot mark the aggregate up to date
|
|
# and skip both builds.
|
|
.PHONY: image image-backupstrategy-controller image-redis-backup image-backup-http-client
|
|
|
|
image: image-backupstrategy-controller image-redis-backup image-backup-http-client
|
|
|
|
image-backupstrategy-controller:
|
|
docker buildx build -f images/backupstrategy-controller/Dockerfile ../../.. \
|
|
$(call image-tags,backupstrategy-controller,v$(COZYSTACK_VERSION)) \
|
|
$(call cache-args,backupstrategy-controller) \
|
|
--metadata-file images/backupstrategy-controller.json \
|
|
$(BUILDX_ARGS)
|
|
IMAGE="$(REGISTRY)/backupstrategy-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/backupstrategy-controller.json -o json -r)" \
|
|
yq -i '.backupStrategyController.image = strenv(IMAGE)' values.yaml
|
|
rm -f images/backupstrategy-controller.json
|
|
|
|
# Depends on image-backupstrategy-controller so the two recipes never rewrite
|
|
# values.yaml concurrently under `make -j image` — each stamps a digest with
|
|
# `yq -i`, and a concurrent write would drop one of them.
|
|
image-redis-backup: image-backupstrategy-controller
|
|
docker buildx build -f images/redis-backup/Dockerfile images/redis-backup \
|
|
$(call image-tags,redis-backup,v$(COZYSTACK_VERSION)) \
|
|
$(call cache-args,redis-backup) \
|
|
--metadata-file images/redis-backup.json \
|
|
$(BUILDX_ARGS)
|
|
IMAGE="$(REGISTRY)/redis-backup:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/redis-backup.json -o json -r)" \
|
|
yq -i '.backupStrategyController.redisBackupClientImage = strenv(IMAGE)' values.yaml
|
|
rm -f images/redis-backup.json
|
|
|
|
# Chained after image-redis-backup for the same reason: one `yq -i` writer at a
|
|
# time. Both keys get the same ref, so the repository stays pinned at a single
|
|
# digest (hack/image-pin-consistency.bats).
|
|
image-backup-http-client: image-redis-backup
|
|
docker buildx build -f images/backup-http-client/Dockerfile images/backup-http-client \
|
|
$(call image-tags,backup-http-client,v$(COZYSTACK_VERSION)) \
|
|
$(call cache-args,backup-http-client) \
|
|
--metadata-file images/backup-http-client.json \
|
|
$(BUILDX_ARGS)
|
|
IMAGE="$(REGISTRY)/backup-http-client:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/backup-http-client.json -o json -r)" \
|
|
yq -i '.backupStrategyController.chBackupClientImage = strenv(IMAGE) | .backupStrategyController.rabbitmqBackupClientImage = strenv(IMAGE)' values.yaml
|
|
rm -f images/backup-http-client.json
|
|
|
|
test:
|
|
helm unittest .
|