Skip to content

Commit f5c2d8c

Browse files
committed
Used pattern for rules targetting run-docker-*
`make help` & `make run-docker-*` are unchanged: ``` $ make | grep run-docker make run-docker-alpine-dev Start Glances Alpine Docker dev in console mode make run-docker-alpine-full Start Glances Alpine Docker full in console mode make run-docker-alpine-minimal Start Glances Alpine Docker minimal in console mode make run-docker-ubuntu-dev Start Glances Ubuntu Docker dev in console mode make run-docker-ubuntu-full Start Glances Ubuntu Docker full in console mode make run-docker-ubuntu-minimal Start Glances Ubuntu Docker minimal in console mode $ make run-docker-alpine-minimal -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-alpine-minimal $ make run-docker-alpine-full -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-alpine-full $ make run-docker-alpine-dev -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-alpine-dev $ make run-docker-ubuntu-dev -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-ubuntu-dev $ make run-docker-ubuntu-full -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-ubuntu-full $ make run-docker-ubuntu-minimal -n docker run --rm -e TZ="" -e GLANCES_OPT="" --pid host --network host -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro -it glances:local-ubuntu-minimal ``` Signed-off-by: Ariel Otilibili <otilibil@eurecom.fr>
1 parent 516c99e commit f5c2d8c

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -271,23 +271,15 @@ run-min-debug: ## Start minimal Glances in debug console mode (also called stand
271271
run-min-local-conf: ## Start minimal Glances in console mode with the system conf file
272272
$(VENV_MIN)/python -m glances
273273

274-
run-docker-alpine-minimal: ## Start Glances Alpine Docker minimal in console mode
275-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-minimal
274+
$(DOCKER_RUNTIMES): run-docker-%:
275+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it $(DOCKER_TAG)
276276

277+
run-docker-alpine-minimal: ## Start Glances Alpine Docker minimal in console mode
277278
run-docker-alpine-full: ## Start Glances Alpine Docker full in console mode
278-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-full
279-
280279
run-docker-alpine-dev: ## Start Glances Alpine Docker dev in console mode
281-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-dev
282-
283280
run-docker-ubuntu-minimal: ## Start Glances Ubuntu Docker minimal in console mode
284-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-minimal
285-
286281
run-docker-ubuntu-full: ## Start Glances Ubuntu Docker full in console mode
287-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-full
288-
289282
run-docker-ubuntu-dev: ## Start Glances Ubuntu Docker dev in console mode
290-
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-dev
291283

292284
run-webserver: ## Start Glances in Web server mode
293285
$(PYTHON) -m glances -C $(CONF) -w

0 commit comments

Comments
 (0)