Change in coreboot[master]: util/docker/Makefile: Add documentation docker image targets

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Arthur Heymans (Code Review)

17 Oct 2019 17 Oct '19

1:21 p.m.

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

util/docker/Makefile: Add documentation docker image targets

Run - make -C util/docker doc.coreboot.org to build the docker image - make -C util/docker docker-build-docs to build the documentation - make -C docker-livehtml-docs to serve autoupdated documentation over http://0.0.0.0:8000

Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/docker/Makefile 1 file changed, 19 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/36104/1

diff --git a/util/docker/Makefile b/util/docker/Makefile index 6925b57..fbe3785 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -71,6 +71,10 @@ upload-coreboot-jenkins-node: test-docker-login $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG)

+doc.coreboot.org: test-docker + $(DOCKER) build --force-rm -t doc.coreboot.org \ + $(top)/util/docker/doc.coreboot.org/ + docker-killall: test-docker @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ $(DOCKER) kill $$($(DOCKER) ps | grep 'coreboot' | cut -f1 -d ' '); \ @@ -166,6 +170,20 @@ -it "$$(docker ps | grep coreboot-jenkins-node | cut -f1 -d' ')" \ /bin/bash -l

+docker-build-docs: test-docker +docker-build-docs: + $(DOCKER) run -it --rm \ + --user "$(id -u):$(id -g)" \ + -v "$(top)/:/data-in/:ro" \ + -v "$(top)Documentation/_build/:/data-out/" \ + doc.coreboot.org + +docker-livehtml-docs: test-docker +docker-livehtml-docs: + $(DOCKER) run -it --rm \ + --net=host -v "$(top)/:/data-in/:ro" \ + doc.coreboot.org livehtml + help: @echo "Commands for working with docker images:" @echo " coreboot-sdk - Build coreboot-sdk container" @@ -199,5 +217,5 @@ .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 docker-jenkins-attach +.PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server docker-jenkins-attach docker-build-docs .PHONY: help

Attachments:

attachment.htm (text/html — 5.1 KB)

Show replies by date

Arthur Heymans (Code Review)

17 Oct 17 Oct

1:32 p.m.

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 1: Code-Review-2

Update help and fix.

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Comment-Date: Thu, 17 Oct 2019 20:32:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Arthur Heymans (Code Review)

3:34 p.m.

Hello build bot (Jenkins), Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/36104

to look at the new patch set (#2).

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

util/docker/Makefile: Add documentation docker image targets

Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/docker/Makefile 1 file changed, 23 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/36104/2

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 2 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Arthur Heymans (Code Review)

23 Oct 23 Oct

10:20 a.m.

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 2: -Code-Review

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 2 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 23 Oct 2019 17:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

12:53 p.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36104/2//COMMIT_MSG Commit Message:

https://review.coreboot.org/c/coreboot/+/36104/2//COMMIT_MSG@12 PS2, Line 12: missing "util/docker"

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 2 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 23 Oct 2019 19:53:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Arthur Heymans (Code Review)

12:56 p.m.

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/36104

to look at the new patch set (#3).

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

util/docker/Makefile: Add documentation docker image targets

Run - make -C util/docker doc.coreboot.org to build the docker image - make -C util/docker docker-build-docs to build the documentation - make -C util/docker-livehtml-docs to serve autoupdated documentation over http://0.0.0.0:8000

Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/docker/Makefile 1 file changed, 23 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/36104/3

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 3 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Patrick Georgi (Code Review)

24 Oct 24 Oct

8:49 a.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36104/2//COMMIT_MSG Commit Message:

https://review.coreboot.org/c/coreboot/+/36104/2//COMMIT_MSG@12 PS2, Line 12:

...

missing "util/docker"

Done

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 3 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 24 Oct 2019 15:49:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Arthur Heymans (Code Review)

7 Nov 7 Nov

2:46 p.m.

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36104/2/util/docker/Makefile File util/docker/Makefile:

https://review.coreboot.org/c/coreboot/+/36104/2/util/docker/Makefile@173 PS2, Line 173: docker-build-docs: test-docker

...

should these targets depend on the doc.coreboot.org target so the image gets built?

It's a phony, so no?

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 3 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 07 Nov 2019 22:46:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Arthur Heymans (Code Review)

2:57 p.m.

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/36104

to look at the new patch set (#4).

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

util/docker/Makefile: Add documentation docker image targets

Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M util/docker/Makefile 1 file changed, 23 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/36104/4

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 4 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Patrick Georgi (Code Review)

19 Nov 19 Nov

5 a.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

Patch Set 4: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 4 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 19 Nov 2019 13:00:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

5 a.m.

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36104 )

Change subject: util/docker/Makefile: Add documentation docker image targets ......................................................................

util/docker/Makefile: Add documentation docker image targets

Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/36104 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/docker/Makefile 1 file changed, 23 insertions(+), 0 deletions(-)

Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved

diff --git a/util/docker/Makefile b/util/docker/Makefile index 6925b57..619de85 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -71,6 +71,10 @@ upload-coreboot-jenkins-node: test-docker-login $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG)

+doc.coreboot.org: test-docker + $(DOCKER) build --force-rm -t doc.coreboot.org \ + $(top)/util/docker/doc.coreboot.org/ + docker-killall: test-docker @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ $(DOCKER) kill $$($(DOCKER) ps | grep 'coreboot' | cut -f1 -d ' '); \ @@ -166,12 +170,27 @@ -it "$$(docker ps | grep coreboot-jenkins-node | cut -f1 -d' ')" \ /bin/bash -l

+docker-build-docs: test-docker +docker-build-docs: + $(DOCKER) run -it --rm \ + --user $(UID):$(GID) \ + -v "$(top)/:/data-in/:ro" \ + -v "$(top)/Documentation/_build/:/data-out/" \ + doc.coreboot.org + +docker-livehtml-docs: test-docker +docker-livehtml-docs: + $(DOCKER) run -it --rm \ + --net=host -v "$(top)/:/data-in/:ro" \ + doc.coreboot.org livehtml + help: @echo "Commands for working with docker images:" @echo " coreboot-sdk - Build coreboot-sdk container" @echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com" @echo " coreboot-jenkins-node - Build coreboot-jenkins-node container" @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com" + @echo " doc.coreboot.org - Build doc.coreboot.org container" @echo " clean-coreboot-containers - Remove all docker coreboot containers" @echo " clean-coreboot-images - Remove all docker coreboot images" @echo " clean-docker - Remove docker coreboot containers & images" @@ -186,6 +205,8 @@ @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 " docker-build-docs - Build the documentation" + @echo " docker-livehtml-docs - Run sphinx-autobuild" @echo @echo "Variables:" @echo " COREBOOT_JENKINS_PORT=$(COREBOOT_JENKINS_PORT)" @@ -197,7 +218,9 @@ .PHONY: test-docker test-docker-login .PHONY: coreboot-jenkins-node upload-coreboot-jenkins-node .PHONY: coreboot-sdk upload-coreboot-sdk +.PHONY: doc.coreboot.org .PHONY: clean-coreboot-containers clean-coreboot-images .PHONY: docker-abuild .PHONY: docker-what-jenkins-does docker-shell docker-jenkins-server docker-jenkins-attach +.PHONY: docker-build-docs docker-livehtml-docs .PHONY: help

-- To view, visit https://review.coreboot.org/c/coreboot/+/36104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic07f216f8d90d6e212383250b852dc91575304c3 Gerrit-Change-Number: 36104 Gerrit-PatchSet: 5 Gerrit-Owner: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Arthur Heymans arthur@aheymans.xyz Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

1826

days inactive

1859

days old

coreboot-gerrit@coreboot.org

10 comments

2 participants

tags (0)

participants (2)

Arthur Heymans (Code Review)
Patrick Georgi (Code Review)