From b41c9327963176b153bae9ea76cc43f2e5fa724f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 21 May 2018 00:35:59 -0400 Subject: [PATCH] Improve the docker-shell target. Signed-off-by: Roberto Rosario --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 189adc3171..b800846533 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ APT_PROXY ?= `/sbin/ip route|awk '/docker0/ { print $$9 }'`:3142 DOCKER_VERSION ?= `cat docker/version` +CONSOLE_COLUMNS ?= `echo $$(tput cols)` +CONSOLE_LINES ?= `echo $$(tput lines)` help: @echo @@ -371,4 +373,4 @@ docker-build-with-proxy: docker build -t mayanedms/mayanedms:$(DOCKER_VERSION) -f docker/Dockerfile --build-arg APT_PROXY=$(APT_PROXY) . docker-shell: - docker exec -e TERM=$TERM -e "COLUMNS=$(tput cols)" -e "LINES=$(tput lines)" -it $(DOCKER_CONTAINER) /bin/bash + docker exec -e TERM=$(TERM) -e "COLUMNS=$(CONSOLE_COLUMNS)" -e "LINES=$(CONSOLE_LINES)" -it $(DOCKER_CONTAINER) /bin/bash