From 30d0b5b130bece1c38df3999efcf6aba5b54a452 Mon Sep 17 00:00:00 2001 From: Justin Kromlinger Date: Wed, 13 Apr 2022 16:46:25 +0200 Subject: [PATCH] Parametrize 'docker' command Allows 'make image-base DOCKER=podman' Originally from: Grzegorz Klimaszewski <2612193+grzegorzk@users.noreply.github.com> https://github.com/archlinux/archlinux-docker/pull/38/files Closes #51. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1932f74..64d706f 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +DOCKER=docker BUILDDIR=$(shell pwd)/build OUTPUTDIR=$(shell pwd)/output @@ -62,8 +63,8 @@ $(OUTPUTDIR)/Dockerfile.base-devel: $(OUTPUTDIR)/base-devel.tar.xz .PHONY: docker-image-base image-base: $(OUTPUTDIR)/Dockerfile.base - docker build -f $(OUTPUTDIR)/Dockerfile.base -t archlinux/archlinux:base $(OUTPUTDIR) + ${DOCKER} build -f $(OUTPUTDIR)/Dockerfile.base -t archlinux/archlinux:base $(OUTPUTDIR) .PHONY: docker-image-base-devel image-base-devel: $(OUTPUTDIR)/Dockerfile.base-devel - docker build -f $(OUTPUTDIR)/Dockerfile.base-devel -t archlinux/archlinux:base-devel $(OUTPUTDIR) + ${DOCKER} build -f $(OUTPUTDIR)/Dockerfile.base-devel -t archlinux/archlinux:base-devel $(OUTPUTDIR)