Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scottstamp stale links pr carry #9682

Merged
merged 2 commits into from
Dec 18, 2014

Conversation

SvenDowideit
Copy link
Contributor

squash and carry @scottstamp's PR #9646

and then fix the other things his script found.

Fixed anchor links for Jessie/Wheezy (broken on docs.docker.com)

Update debian.md

Signed-off-by: Scott Stamp <scott@hypermine.com>
@SvenDowideit
Copy link
Contributor Author

@fredlf @jamtur01

@@ -55,6 +55,9 @@ docs-shell: docs-build
docs-release: docs-build
$(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT "$(DOCKER_DOCS_IMAGE)" ./release.sh

docs-test: docs-build
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" ./test.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the test script really expose the port?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't, if the script is running inside the container, it's already referencing localhost by default. It does return a list of addresses that would need to be fixed manually though, so it's probably best to ensure the docs are accessible from outside the container.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

na, that was just something i had when i was testing - so i could view the pages - that turned out to be pointless :)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
@fredlf
Copy link
Contributor

fredlf commented Dec 18, 2014

LGTM Many thanks, @scottstamp !

fredlf pushed a commit that referenced this pull request Dec 18, 2014
@fredlf fredlf merged commit 5df189a into moby:master Dec 18, 2014
@tianon
Copy link
Member

tianon commented Dec 19, 2014

@fredlf in the future, please let me LGTM Makefile changes before they merge 😉

LGTM

SvenDowideit pushed a commit to SvenDowideit/docker that referenced this pull request Dec 19, 2014
…-pr-carry

Scottstamp stale links pr carry
(cherry picked from commit 5df189a)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
@fredlf
Copy link
Contributor

fredlf commented Dec 22, 2014

@tianon Sorry about that, will do. Didn't occur to me that this change was outside docs' purview. Ooops. Mea culpa.

@SvenDowideit SvenDowideit deleted the scottstamp-stale-links-pr-carry branch April 26, 2015 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants