diff options
| author | Christian Hesse <mail@eworm.de> | 2020-01-28 14:29:01 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-01-30 11:38:45 +0100 |
| commit | d7b48187218d59f73bb5769284e7eb4a5887aa64 (patch) | |
| tree | 6d758800b2cf502aad909958105e661022b479b4 | |
| parent | 57eee2407c584910a1747d9350cec4fb2420a338 (diff) | |
| download | vis-d7b48187218d59f73bb5769284e7eb4a5887aa64.tar.gz vis-d7b48187218d59f73bb5769284e7eb4a5887aa64.tar.xz | |
build: allow to replace docker
This allows to build with docker-compatible container engine:
make DOCKER=podman docker
| -rw-r--r-- | Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -48,6 +48,7 @@ LDFLAGS_VIS = $(LDFLAGS_AUTO) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LDFLAGS_ACL STRIP?=strip TAR?=tar +DOCKER?=docker all: $(ELF) @@ -84,18 +85,18 @@ vis-single: vis-single.c vis-single-payload.inc ${STRIP} $@ docker: clean - docker build -t vis . - docker run --rm -d --name vis vis tail -f /dev/null - docker exec vis apk update - docker exec vis apk upgrade - docker cp . vis:/build/vis - docker exec vis ./vis/configure CC='cc --static' --enable-acl - docker exec vis make -C vis VERSION="$(VERSION)" clean vis-single - docker cp vis:/build/vis/vis-single vis - docker kill vis + $(DOCKER) build -t vis . + $(DOCKER) run --rm -d --name vis vis tail -f /dev/null + $(DOCKER) exec vis apk update + $(DOCKER) exec vis apk upgrade + $(DOCKER) cp . vis:/build/vis + $(DOCKER) exec vis ./vis/configure CC='cc --static' --enable-acl + $(DOCKER) exec vis make -C vis VERSION="$(VERSION)" clean vis-single + $(DOCKER) cp vis:/build/vis/vis-single vis + $(DOCKER) kill vis docker-clean: clean - -docker image rm vis + -$(DOCKER) image rm vis debug: clean @$(MAKE) CFLAGS_EXTRA='${CFLAGS_EXTRA} ${CFLAGS_DEBUG}' |