<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27494">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/docker: Update Makefile to improve shell access<br><br>- Create a new target, docker-jenkins-attach, to access the running<br>jenkins server<br>- Update docker-shell target to set term & size.<br><br>Change-Id: Ifa67afb62d4a216281ebece405e9b26fd4d14622<br>Signed-off-by: Martin Roth <gaumless@gmail.com><br>---<br>M util/docker/Makefile<br>1 file changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/27494/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/docker/Makefile b/util/docker/Makefile</span><br><span>index 8bec631..beb2a7e 100644</span><br><span>--- a/util/docker/Makefile</span><br><span>+++ b/util/docker/Makefile</span><br><span>@@ -150,11 +150,19 @@</span><br><span> docker-shell: USER=coreboot</span><br><span> docker-shell: test-docker</span><br><span>  $(DOCKER) run -u $(USER) -it \</span><br><span style="color: hsl(120, 100%, 40%);">+                -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \</span><br><span>                 -w /home/coreboot/coreboot \</span><br><span>                 -v $(top):/home/coreboot/coreboot \</span><br><span>          --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span>           /bin/bash -l</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+docker-jenkins-attach: USER=root</span><br><span style="color: hsl(120, 100%, 40%);">+docker-jenkins-attach:</span><br><span style="color: hsl(120, 100%, 40%);">+    docker exec --user $(USER) \</span><br><span style="color: hsl(120, 100%, 40%);">+          -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \</span><br><span style="color: hsl(120, 100%, 40%);">+          -it "$$(docker ps | grep coreboot-jenkins-node | cut -f1 -d' ')" \</span><br><span style="color: hsl(120, 100%, 40%);">+          /bin/bash -l</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> help:</span><br><span>      @echo "Commands for working with docker images:"</span><br><span>   @echo "  coreboot-sdk                 - Build coreboot-sdk container"</span><br><span>@@ -174,6 +182,7 @@</span><br><span>        @echo "  docker-shell                 - Bash prompt in coreboot-jenkins-node"</span><br><span>      @echo "      <USER=root or USER=coreboot>"</span><br><span>   @echo "  docker-jenkins-server        - Run coreboot-jenkins-node image (for server)"</span><br><span style="color: hsl(120, 100%, 40%);">+       @echo "  docker-jenkins-attach        - Open shell in running jenkins server"</span><br><span>      @echo</span><br><span>        @echo "Variables:"</span><br><span>         @echo "  COREBOOT_JENKINS_PORT=$(COREBOOT_JENKINS_PORT)"</span><br><span>@@ -187,5 +196,5 @@</span><br><span> .PHONY: coreboot-sdk upload-coreboot-sdk</span><br><span> .PHONY: clean-coreboot-containers clean-coreboot-images</span><br><span> .PHONY: docker-abuild</span><br><span style="color: hsl(0, 100%, 40%);">-.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server docker-jenkins-attach</span><br><span> .PHONY: help</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27494">change 27494</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27494"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifa67afb62d4a216281ebece405e9b26fd4d14622 </div>
<div style="display:none"> Gerrit-Change-Number: 27494 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>