CI: consistently use DOCKER_CMD in makefiles

This allows rebuilding containers using podman too.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Marek Marczykowski-Górecki authored and Andrew Cooper committed 2025-04-07 19:17:38 +01:00
1 parent b8d41a9b22
commit 5606b982ac
2 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -31,8 +31,8 @@ clean:
define CLEAN_RULE
.PHONY: clean-$(1)
clean-$(1):
if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \
docker image rm $(REGISTRY)/$(subst /,:,$(1)); \
if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \
$(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \
fi
endef
+2 -2
View File
@@ -10,9 +10,9 @@ help:
@echo "To push container builds, set the env var PUSH"
%: %.dockerfile ## Builds containers
docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
$(DOCKER_CMD) build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
@if [ ! -z $${PUSH+x} ]; then \
docker push $(REGISTRY)/$(@D):$(@F); \
$(DOCKER_CMD) push $(REGISTRY)/$(@D):$(@F); \
fi
.PHONY: all
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.