summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2023-07-31 09:19:09 -0600
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-08-15 16:49:12 +0000
commit54216dd9aa6f973b95599e160d8c6f7f6747451e (patch)
tree8f883dbf5a33e18643ca0e89e10f53d453e2a968 /util
parent3749c9f1c46c83bf51e9e38ad8d62c025fdc68e5 (diff)
util/docker: Add docker-jenkins-shell target
The docker-shell target was originally intended to point at the docker-jenkins-node image, and was documented as such. It was actually split into two targets - docker-shell and docker-jenkins-shell. This fixes the documentation for docker-shell and adds new help for docker-jenkins-shell. The docker-jenkins-shell target is also noted as phoney now. Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: Ib3ce82f6a73a2f81e5ae51ce8063ae4e59ef67db Reviewed-on: https://review.coreboot.org/c/coreboot/+/76854 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Diffstat (limited to 'util')
-rw-r--r--util/docker/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/util/docker/Makefile b/util/docker/Makefile
index 4386ebe6b9..13fa80d9b7 100644
--- a/util/docker/Makefile
+++ b/util/docker/Makefile
@@ -205,7 +205,9 @@ help:
@echo " docker-abuild - Run abuild under coreboot-sdk"
@echo " <ABUILD_ARGS='-a -B'>"
@echo " docker-what-jenkins-does - Run 'what-jenkins-does' target"
- @echo " docker-shell - Bash prompt in coreboot-jenkins-node"
+ @echo " docker-jenkins-shell - Bash prompt in coreboot-jenkins-node"
+ @echo " <USER=root or USER=coreboot>"
+ @echo " docker-shell - Bash prompt in coreboot-sdk"
@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"
@@ -225,6 +227,7 @@ help:
.PHONY: doc.coreboot.org
.PHONY: clean-coreboot-containers clean-coreboot-images docker-cleanall
.PHONY: docker-abuild
-.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server docker-jenkins-attach
+.PHONY: docker-shell docker-jenkins-shell
+.PHONY: docker-what-jenkins-does docker-jenkins-server docker-jenkins-attach
.PHONY: docker-build-docs docker-livehtml-docs
.PHONY: help