Fixed merge conflicts

This commit is contained in:
frikky
2023-07-06 17:39:40 +02:00
209 changed files with 1826 additions and 68 deletions
Regular → Executable
View File
View File
View File
Regular → Executable
View File
Regular → Executable
View File
+1 -1
View File
@@ -586,7 +586,7 @@ func deployWorker(image string, identifier string, env []string, executionReques
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
if cleanupEnv == "true" {
if strings.ToLower(cleanupEnv) == "true" {
hostConfig.AutoRemove = true
}
Regular → Executable
View File
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
View File