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

Update swarm mode endpoint #4208

Merged
merged 2 commits into from
Nov 20, 2018
Merged

Update swarm mode endpoint #4208

merged 2 commits into from
Nov 20, 2018

Conversation

siyu6974
Copy link
Contributor

@siyu6974 siyu6974 commented Nov 19, 2018

What does this PR do?

According to docker's doc, https://docs.docker.com/engine/swarm/swarm-tutorial/#the-ip-address-of-the-manager-machine, port 2375 is replaced by 2377 for cluster management communications

Motivation

Use port 2375 simply does not work with the new swarm the doc needs an update

More

  • Added/updated tests
  • Added/updated documentation

Additional Notes

endpoint = "tcp://127.0.0.1:2377" is only usable when launching traefik directly on the host. In a dockerized environment, endpoint = "unix:///var/run/docker.sock" should be used with a mounted volume /var/run/docker.sock:/var/run/docker.sock

Copy link
Contributor

@nmengin nmengin left a comment

Choose a reason for hiding this comment

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

Many thanks for the PR @siyu6974 .

One suggestion.

docs/configuration/backends/docker.md Outdated Show resolved Hide resolved
Copy link
Contributor

@nmengin nmengin left a comment

Choose a reason for hiding this comment

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

LGTM 📖 👍

@siyu6974 siyu6974 requested a review from a team as a code owner November 20, 2018 15:27
@ldez ldez changed the base branch from master to v1.7 November 20, 2018 15:27
@ldez ldez removed the request for review from a team November 20, 2018 15:29
@ldez ldez added kind/enhancement a new or improved feature. and removed bot/no-merge labels Nov 20, 2018
Copy link
Contributor

@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

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

@ldez ldez added this to the 1.7 milestone Nov 20, 2018
@traefiker traefiker merged commit ef6c1fa into traefik:v1.7 Nov 20, 2018
@siyu6974 siyu6974 deleted the patch-1 branch November 20, 2018 16:00
@juliens juliens mentioned this pull request Nov 26, 2018
2 tasks
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.

6 participants