Skip to content

Add make command for previewing API docs#29078

Merged
cpuguy83 merged 1 commit intomoby:masterfrom
bfirsh:add-swagger-docs
Dec 14, 2016
Merged

Add make command for previewing API docs#29078
cpuguy83 merged 1 commit intomoby:masterfrom
bfirsh:add-swagger-docs

Conversation

@bfirsh
Copy link
Contributor

@bfirsh bfirsh commented Dec 2, 2016

Much easier than the previous method of copying over to the docs
repository and generating the docs.

And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.

Signed-off-by: Ben Firshman [email protected]

@bfirsh bfirsh changed the title Add make command for previewing docs Add make command for previewing API docs Dec 2, 2016
Makefile Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Not sure this is great.
Maybe we can move this into a hack/make/swagger-docs script that can just do a -p and then report the port being exposed.
Or an env var like DOCKER_SWAGGER_PORT.
But still set the host port to something like 3000 instead of 80.

Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

One issue, otherwise this is really awesome.

@bfirsh
Copy link
Contributor Author

bfirsh commented Dec 5, 2016

@cpuguy83 Fixed!

Makefile Outdated
Copy link
Member

Choose a reason for hiding this comment

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

can you add a ## comment here? We use it for make help to show a nice usage description ❤️

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!

Copy link
Member

Choose a reason for hiding this comment

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

❤️ thanks!

@thaJeztah
Copy link
Member

Thanks @bfirsh this should get reviewers going

do you think we can add some basic skinning from the docs.docker.com site, or would that be difficult?

screen shot 2016-12-05 at 17 09 01

@bfirsh
Copy link
Contributor Author

bfirsh commented Dec 5, 2016

@thaJeztah It doesn't have the docs.docker.com skin - that's how it looks. The only thing broken is the colour missing in the top-left.

I can add that when I get time, but I don't think it's critical. If this gets merged before I'll get to it I'll open a follow-up to fix it. :)

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

I'm okay with fixing the nits in a follow up

LGTM

Makefile Outdated
Copy link
Member

Choose a reason for hiding this comment

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

I still think this should be configurable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cpuguy83 Fixed!

@bfirsh bfirsh force-pushed the add-swagger-docs branch 2 times, most recently from 64c17a0 to 273ddcd Compare December 14, 2016 12:05
Makefile Outdated
Copy link
Member

Choose a reason for hiding this comment

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

oh! looks like it has to be on the line below, make help doesn't seem to pick it up if it's here 😢

we can fix it in a follow up if needed, no blocker

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ooops my bad. fixed!

Copy link
Member

Choose a reason for hiding this comment

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

Thank you!

Much easier than the previous method of copying over to the docs
repository and generating the docs.

And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.

Signed-off-by: Ben Firshman <[email protected]>
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

still LGTM

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐻

@cpuguy83
Copy link
Member

Merging since tests won't do anything for this PR.

@cpuguy83 cpuguy83 merged commit c856c0c into moby:master Dec 14, 2016
@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Dec 14, 2016
@bfirsh bfirsh deleted the add-swagger-docs branch December 15, 2016 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants