From a16870bfb5d5f62a441795dfece3e137dbdae3aa Mon Sep 17 00:00:00 2001 From: Annika Hannig Date: Fri, 16 Apr 2021 10:21:53 +0200 Subject: [PATCH] allow for overriding docker with podman --- client/Makefile.docker | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/Makefile.docker b/client/Makefile.docker index 7af9d03..8e2e0a9 100644 --- a/client/Makefile.docker +++ b/client/Makefile.docker @@ -1,7 +1,8 @@ +DOCKER := docker DOCKER_CONTAINER := alice-lg-node-build DOCKER_IMAGE := alice-lg-node:latest -DOCKER_EXEC := docker run --rm -t -i \ +DOCKER_EXEC := $(DOCKER) run --rm -t -i \ -a stdin -a stdout -a stderr \ -v `pwd`:/client/ \ --name $(DOCKER_CONTAINER) \ @@ -11,7 +12,7 @@ all: client @echo "Built alice-lg client" image: - docker build . -t $(DOCKER_IMAGE) + $(DOCKER) build . -t $(DOCKER_IMAGE) deps: image $(DOCKER_EXEC) "yarn install" @@ -29,12 +30,12 @@ watch: stop: @echo "Stopping docker container: $(DOCKER_CONTAINER)" - -docker stop $(DOCKER_CONTAINER) + -$(DOCKER) stop $(DOCKER_CONTAINER) @sleep 1 kill: @echo "Killing docker container: $(DOCKER_CONTAINER)" - -docker kill $(DOCKER_CONTAINER) + -$(DOCKER) kill $(DOCKER_CONTAINER) @sleep 1