Minor tweaks to opimise container deploments
This commit is contained in:
@@ -3870,7 +3870,7 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
|
|||||||
var options container.StopOptions
|
var options container.StopOptions
|
||||||
for _, containername := range stopContainers {
|
for _, containername := range stopContainers {
|
||||||
log.Printf("[INFO] Stopping and removing container %s", containerNames[containername])
|
log.Printf("[INFO] Stopping and removing container %s", containerNames[containername])
|
||||||
dockercli.ContainerStop(ctx, containername, options)
|
go dockercli.ContainerStop(ctx, containername, options)
|
||||||
removeContainers = append(removeContainers, containername)
|
removeContainers = append(removeContainers, containername)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3220,7 +3220,11 @@ func deploySwarmService(dockercli *dockerclient.Client, name, image string, depl
|
|||||||
networkName = swarmNetworkName
|
networkName = swarmNetworkName
|
||||||
}
|
}
|
||||||
|
|
||||||
replicas := uint64(2)
|
// Apps used a lot should have 2 replicas (default)
|
||||||
|
replicas := uint64(1)
|
||||||
|
if (strings.Contains(strings.ToLower(name), "shuffle") && strings.Contains(strings.ToLower(name), "tools")) || strings.Contains(strings.ToLower(name), "http") {
|
||||||
|
replicas = 2
|
||||||
|
}
|
||||||
|
|
||||||
// Sent from Orborus
|
// Sent from Orborus
|
||||||
// Should be equal to
|
// Should be equal to
|
||||||
@@ -4115,6 +4119,10 @@ func checkStandaloneRun() {
|
|||||||
// Check if the required argc/argv is set
|
// Check if the required argc/argv is set
|
||||||
//log.Printf("ARGS: %#v", os.Args)
|
//log.Printf("ARGS: %#v", os.Args)
|
||||||
if len(os.Args) < 4 {
|
if len(os.Args) < 4 {
|
||||||
|
if debug {
|
||||||
|
log.Printf("[DEBUG] You can run the worker in standalone mode with: go run worker.go standalone <executionid> <authorization> <optional:url>")
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4273,6 +4281,10 @@ func checkStandaloneRun() {
|
|||||||
|
|
||||||
// Initial loop etc
|
// Initial loop etc
|
||||||
func main() {
|
func main() {
|
||||||
|
// Testing swarm auto-replacements.
|
||||||
|
//findAppInfo("frikky/shuffle:shuffle-ai_1.0.0", "shuffle-ai_1-0-0", true)
|
||||||
|
//findAppInfo("frikky/shuffle:shuffle-ai_1.0.0", "singul_1-0-0", true)
|
||||||
|
|
||||||
checkStandaloneRun()
|
checkStandaloneRun()
|
||||||
|
|
||||||
if os.Getenv("DEBUG") == "true" {
|
if os.Getenv("DEBUG") == "true" {
|
||||||
|
|||||||
Reference in New Issue
Block a user