Fix multiple frontends with docker-compose --scale #3190
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbdoumenjou
added
kind/bug/fix
jbdoumenjou
force-pushed
the
hotfix/3145-multiplefrontends
branch
2 times, most recently
from
09339fc
to
0c9ca7e
Compare
ldez
suggested changes
Apr 16, 2018
integration/docker_compose_test.go
Outdated
| } | ||
|
|
||
| func (s *DockerComposeSuite) SetUpSuite(c *check.C) { | ||
| s.createComposeProject(c, "minimal") |
There was a problem hiding this comment.
s.createComposeProject(c, composeProject)
integration/docker_compose_test.go
Outdated
|
|
||
| func (s *DockerComposeSuite) TestComposeScale(c *check.C) { | ||
| const serviceCount = 2 | ||
| const composeService = "whoami1" |
integration/docker_compose_test.go
Outdated
| // check that we have only one backend with n servers | ||
| c.Assert(provider.Backends, checker.HasLen, 1) | ||
| myBackend := provider.Backends["backend-"+composeService+"-integrationtest"+composeProject] | ||
| c.Assert(myBackend.Servers, checker.HasLen, serviceCount) |
There was a problem hiding this comment.
you need to check if the backend exists before check if the server exists in the backend.
provider/docker/config.go
Outdated
|
|
||
| serviceNameKey += segmentName | ||
|
|
||
| return serviceNameKey |
There was a problem hiding this comment.
return serviceNameKey + segmentName
ldez
suggested changes
Apr 16, 2018
integration/docker_compose_test.go
Outdated
| // Docker test suites | ||
| type DockerComposeSuite struct { | ||
| BaseSuite | ||
| project *docker.Project |
| } | ||
|
|
||
| func (s *DockerComposeSuite) TestComposeScale(c *check.C) { | ||
| var serviceCount = 2 |
There was a problem hiding this comment.
not needed, only one occurrence.
traefiker
force-pushed
the
hotfix/3145-multiplefrontends
branch
from
27ce6c5
to
07a3f72
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR update the docker provider to fix an issue with the docker compose scale.
Motivation
Fix #3145
More