Merge branch v2.9 into master
This commit is contained in:
commit
cd0654026a
21 changed files with 254 additions and 322 deletions
|
@ -47,12 +47,6 @@ func nodeIP(ip string) func(*docker.ContainerJSON) {
|
|||
}
|
||||
}
|
||||
|
||||
func labels(labels map[string]string) func(*docker.ContainerJSON) {
|
||||
return func(c *docker.ContainerJSON) {
|
||||
c.Config.Labels = labels
|
||||
}
|
||||
}
|
||||
|
||||
func ports(portMap nat.PortMap) func(*docker.ContainerJSON) {
|
||||
return func(c *docker.ContainerJSON) {
|
||||
c.NetworkSettings.NetworkSettingsBase.Ports = portMap
|
||||
|
|
|
@ -30,7 +30,7 @@ func (p *Provider) SetDefaults() {
|
|||
|
||||
// Init the provider.
|
||||
func (p *Provider) Init() error {
|
||||
config := redis.Config{
|
||||
config := &redis.Config{
|
||||
Username: p.Username,
|
||||
Password: p.Password,
|
||||
DB: p.DB,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue