From 0dbb417d43214d4b72df6a8a383c1f91926ce521 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 1 Jul 2019 14:06:16 -0500 Subject: [PATCH] 3rdparty/docker/bootstrap: Fix defaults to be more generic and engine selection Change-Id: I8a1e3c6bd641ea08a5a06985389269d708d94655 --- 3rdparty/docker/bootstrap/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile index 6605354c47..5778206e55 100644 --- a/3rdparty/docker/bootstrap/Makefile +++ b/3rdparty/docker/bootstrap/Makefile @@ -4,13 +4,13 @@ ENGINE=docker # Example mounting source code directory into container # (lets you "work on the code used to bootstrap" a bit easier) SOURCES=$(HOME)/Code -EXTRA=-v $(HOME)/haiku:/work/src/haiku -v $(HOME)/buildtools:/work/src/buildtools +#EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools default: ${ENGINE} build . -t docker.io/haiku/bootstrap clean: - ${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} docker kill {} - ${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} docker rm {} + ${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {} + ${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {} ${ENGINE} volume rm bootstrap_work init: ${ENGINE} run -v bootstrap_work:/work docker.io/haiku/bootstrap prep