diff options
| author | Martin Roth <gaumless@gmail.com> | 2018-07-15 20:10:44 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-07-24 09:07:00 +0000 |
| commit | fbc87b638a25819160db467f82958d2ed673b66b (patch) | |
| tree | 0343a69976f359444278ef3baf9046a35964c05e | |
| parent | c8e974f063af7773f91c267071d747a496b2e9ae (diff) | |
util/docker: Update Makefile to improve shell access
- Create a new target, docker-jenkins-attach, to access the running
jenkins server
- Update docker-shell target to set term & size.
Change-Id: Ifa67afb62d4a216281ebece405e9b26fd4d14622
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: https://review.coreboot.org/27494
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | util/docker/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/util/docker/Makefile b/util/docker/Makefile index 8bec631ab0..beb2a7ed89 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -150,11 +150,19 @@ docker-jenkins-shell: test-docker docker-shell: USER=coreboot docker-shell: test-docker $(DOCKER) run -u $(USER) -it \ + -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \ -w /home/coreboot/coreboot \ -v $(top):/home/coreboot/coreboot \ --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \ /bin/bash -l +docker-jenkins-attach: USER=root +docker-jenkins-attach: + docker exec --user $(USER) \ + -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \ + -it "$$(docker ps | grep coreboot-jenkins-node | cut -f1 -d' ')" \ + /bin/bash -l + help: @echo "Commands for working with docker images:" @echo " coreboot-sdk - Build coreboot-sdk container" @@ -174,6 +182,7 @@ help: @echo " docker-shell - Bash prompt in coreboot-jenkins-node" @echo " <USER=root or USER=coreboot>" @echo " docker-jenkins-server - Run coreboot-jenkins-node image (for server)" + @echo " docker-jenkins-attach - Open shell in running jenkins server" @echo @echo "Variables:" @echo " COREBOOT_JENKINS_PORT=$(COREBOOT_JENKINS_PORT)" @@ -187,5 +196,5 @@ help: .PHONY: coreboot-sdk upload-coreboot-sdk .PHONY: clean-coreboot-containers clean-coreboot-images .PHONY: docker-abuild -.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server +.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server docker-jenkins-attach .PHONY: help |