From 8cb8057c2686672fc486fd822d1a127aec1b8ca4 Mon Sep 17 00:00:00 2001 From: Mikatech Date: Wed, 4 Jan 2023 15:07:18 +0100 Subject: [PATCH] build: update Makefile --- Makefile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d94ceff..a9cebda 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,7 @@ PREFIX ?= pathwar/ PATHWAR_OPTS ?= .PHONY: pathwar.run -pathwar.run: - pathwar $(PATHWAR_OPTS) compose prepare --no-push ./ > pathwar-compose.yml +pathwar.run: pathwar.prepare pathwar $(PATHWAR_OPTS) compose up --force-recreate pathwar-compose.yml .PHONY: pathwar.down @@ -18,14 +17,23 @@ pathwar.ps: docker.build: docker-compose build --pull -.PHONY: pathwar-prepare +.PHONY: pathwar.prepare pathwar.prepare: - pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) --no-push . + pathwar $(PATHWAR_OPTS) compose prepare --no-push . > pathwar-compose.yml -.PHONY: pathwar-push +.PHONY: pathwar.push pathwar.push: - pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) . + pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) . > pathwar-compose.yml + +.PHONY: docker.pathwar.push +docker.pathwar.push: + docker run -it --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock -v "$(PWD):$(PWD)" -w "$(PWD)" pathwar/agent compose prepare --prefix=$(PREFIX) . > pathwar-compose.yml + +.PHONY: pathwar.register +pathwar.register: + pathwar $(PATHWAR_OPTS) compose register --print ./pathwar-compose.yml > _register.sh + chmod +x _register.sh .PHONY: make.bump make.bump: - wget -O rules.mk https://raw.githubusercontent.com/tree/master/challenges/challenge.mk Makefile + wget -O Makefile https://raw.githubusercontent.com/pathwar/pathwar/master/challenges/challenge.mk \ No newline at end of file