Fixed log overloads and docker host proxies for worker and orborus
This commit is contained in:
@@ -353,6 +353,12 @@ func deployServiceWorkers(image string) {
|
|||||||
Resources: &swarm.ResourceRequirements{
|
Resources: &swarm.ResourceRequirements{
|
||||||
Reservations: &swarm.Resources{},
|
Reservations: &swarm.Resources{},
|
||||||
},
|
},
|
||||||
|
LogDriver: &swarm.Driver{
|
||||||
|
Name: "json-file",
|
||||||
|
Options: map[string]string{
|
||||||
|
"max-size": "10m",
|
||||||
|
},
|
||||||
|
},
|
||||||
ContainerSpec: &swarm.ContainerSpec{
|
ContainerSpec: &swarm.ContainerSpec{
|
||||||
Image: image,
|
Image: image,
|
||||||
Env: []string{
|
Env: []string{
|
||||||
@@ -449,13 +455,16 @@ func deployWorker(image string, identifier string, env []string, executionReques
|
|||||||
//CPUShares: 256,
|
//CPUShares: 256,
|
||||||
hostConfig := &container.HostConfig{
|
hostConfig := &container.HostConfig{
|
||||||
LogConfig: container.LogConfig{
|
LogConfig: container.LogConfig{
|
||||||
Type: "json-file",
|
Type: "json-file",
|
||||||
Config: map[string]string{},
|
Config: map[string]string{
|
||||||
|
"max-size": "10m",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Resources: container.Resources{},
|
Resources: container.Resources{},
|
||||||
Binds: []string{
|
}
|
||||||
"/var/run/docker.sock:/var/run/docker.sock:rw",
|
|
||||||
},
|
if len(os.Getenv("DOCKER_HOST")) == 0 {
|
||||||
|
hostConfig.Binds = []string{"/var/run/docker.sock:/var/run/docker.sock:rw"}
|
||||||
}
|
}
|
||||||
|
|
||||||
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
|
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
|
||||||
@@ -1035,6 +1044,10 @@ func main() {
|
|||||||
env = append(env, fmt.Sprintf("DOCKER_API_VERSION=%s", dockerApiVersion))
|
env = append(env, fmt.Sprintf("DOCKER_API_VERSION=%s", dockerApiVersion))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(os.Getenv("DOCKER_HOST")) > 0 {
|
||||||
|
env = append(env, fmt.Sprintf("DOCKER_HOST=%s", os.Getenv("DOCKER_HOST")))
|
||||||
|
}
|
||||||
|
|
||||||
err = deployWorker(workerImage, containerName, env, execution)
|
err = deployWorker(workerImage, containerName, env, execution)
|
||||||
zombiecounter += 1
|
zombiecounter += 1
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|||||||
@@ -299,8 +299,10 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
|
|||||||
//CPUPeriod: 100000,
|
//CPUPeriod: 100000,
|
||||||
hostConfig := &container.HostConfig{
|
hostConfig := &container.HostConfig{
|
||||||
LogConfig: container.LogConfig{
|
LogConfig: container.LogConfig{
|
||||||
Type: "json-file",
|
Type: "json-file",
|
||||||
Config: map[string]string{},
|
Config: map[string]string{
|
||||||
|
"max-size": "10m",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Resources: container.Resources{},
|
Resources: container.Resources{},
|
||||||
}
|
}
|
||||||
@@ -440,8 +442,10 @@ func DeployContainer(ctx context.Context, cli *dockerclient.Client, config *cont
|
|||||||
identifier = fmt.Sprintf("%s-%s-nonetwork", identifier, parsedUuid)
|
identifier = fmt.Sprintf("%s-%s-nonetwork", identifier, parsedUuid)
|
||||||
hostConfig = &container.HostConfig{
|
hostConfig = &container.HostConfig{
|
||||||
LogConfig: container.LogConfig{
|
LogConfig: container.LogConfig{
|
||||||
Type: "json-file",
|
Type: "json-file",
|
||||||
Config: map[string]string{},
|
Config: map[string]string{
|
||||||
|
"max-size": "10m",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Resources: container.Resources{},
|
Resources: container.Resources{},
|
||||||
}
|
}
|
||||||
@@ -2628,6 +2632,12 @@ func deploySwarmService(dockercli *dockerclient.Client, name, image string, depl
|
|||||||
Resources: &swarm.ResourceRequirements{
|
Resources: &swarm.ResourceRequirements{
|
||||||
Reservations: &swarm.Resources{},
|
Reservations: &swarm.Resources{},
|
||||||
},
|
},
|
||||||
|
LogDriver: &swarm.Driver{
|
||||||
|
Name: "json-file",
|
||||||
|
Options: map[string]string{
|
||||||
|
"max-size": "10m",
|
||||||
|
},
|
||||||
|
},
|
||||||
ContainerSpec: &swarm.ContainerSpec{
|
ContainerSpec: &swarm.ContainerSpec{
|
||||||
Image: image,
|
Image: image,
|
||||||
Env: []string{
|
Env: []string{
|
||||||
|
|||||||
Reference in New Issue
Block a user