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.

Sign up for GitHub

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

Jump to bottom

Dashboard example with swarm #5795

Merged
merged 7 commits into from Nov 12, 2019
Merged

Dashboard example with swarm #5795

merged 7 commits into from Nov 12, 2019

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Nov 7, 2019 •
edited

What does this PR do?

This PR adds a Docker Swarm configuration example for dashboard and API in documentation.

(Please note that this PR enables markdown-include to reuse the same examples from ./content/include and uses mkdocs-excludes to forbid MKDocs to watch for the content/includes as it can be heavy).

Motivation

And there's more :)

More

  • Added/updated tests
  • Added/updated documentation

Additional Notes

@traefiker traefiker added this to the 2.0 milestone Nov 7, 2019
ldez
ldez approved these changes Nov 9, 2019
View reviewed changes
Copy link
Member

@ldez ldez left a comment

Choose a reason for hiding this comment

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

LGTM

@ldez ldez added the kind/enhancement a new or improved feature. label Nov 9, 2019
@ldez ldez added this to To review in v2 via automation Nov 9, 2019
@ldez ldez changed the title Docs/dashboard swarm example Dashboard swarm example Nov 9, 2019
@ldez ldez changed the title Dashboard swarm example Dashboard example with swarm Nov 9, 2019
jbdoumenjou
jbdoumenjou approved these changes Nov 12, 2019
View reviewed changes
Copy link
Member

@jbdoumenjou jbdoumenjou left a comment

Choose a reason for hiding this comment

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

LGTM

mmatur
mmatur approved these changes Nov 12, 2019
View reviewed changes
Copy link
Member

@mmatur mmatur left a comment

Choose a reason for hiding this comment

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

LGTM

dduportal and others added 7 commits November 12, 2019 14:22
@dduportal @traefiker
add an example for enabling dashboard on docker swarm
4d3f006 
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@dduportal @traefiker
add an example for enabling api on docker swarm
9e93db7 
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@dduportal @traefiker
Enable markdown include and exlcludes on documentation
22a97aa 
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@dduportal @traefiker
factorize dashboard and API config example thanks to markdown include
e984980 
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@dduportal @traefiker
Switch include syntax for api docuemntation examples to the same as C…
bd796e2 
…LI references

Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@dduportal @traefiker
Set swarm dashboard/api example with a deploy: key
b42b1b1 
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
@ldez @traefiker
review.
c0f06a1
@traefiker traefiker merged commit e30ab07 into traefik:v2.0 Nov 12, 2019
v2 automation moved this from To review to Done Nov 12, 2019
@dduportal dduportal deleted the docs/dashboard-swarm-example branch November 12, 2019 14:56
@dduportal dduportal mentioned this pull request Nov 13, 2019
Open
@dduportal dduportal mentioned this pull request Nov 20, 2019
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbdoumenjou jbdoumenjou jbdoumenjou approved these changes

@mmatur mmatur mmatur approved these changes

@ldez ldez ldez approved these changes

Assignees
No one assigned
Labels
area/documentation area/provider/docker/swarm kind/enhancement a new or improved feature. size/M
Projects
No open projects
v2
Done
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dduportal @jbdoumenjou @mmatur @ldez @traefiker