Added small fixes to orborus and sdk

This commit is contained in:
frikky
2022-01-22 01:46:16 +00:00
committed by GitHub
parent 2230cef978
commit 7b673ccdb4
4 changed files with 18 additions and 4 deletions
+7 -1
View File
@@ -2612,7 +2612,13 @@ class AppBase:
for i in range(0, curminlength):
tmpitem = json.loads(json.dumps(parameter["value"]))
for key, value in replacements.items():
replacement = json.dumps(json.loads(value)[i])
replacement = value
try:
replacement = json.dumps(json.loads(value)[i])
except IndexError as e:
self.logger.info(f"[ERROR] Failed handling value parsing with index: {e}")
pass
if replacement.startswith("\"") and replacement.endswith("\""):
replacement = replacement[1:len(replacement)-1]
#except json.decoder.JSONDecodeError as e:
+1 -1
View File
@@ -64,7 +64,7 @@ services:
- SHUFFLE_SWARM_CONFIG=runn
restart: unless-stopped
opensearch:
image: opensearchproject/opensearch:1.2.3
image: opensearchproject/opensearch:1.2.4
hostname: shuffle-opensearch
container_name: shuffle-opensearch
environment:
+1 -1
View File
@@ -1,5 +1,5 @@
NAME=shuffle-orborus
VERSION=0.9.50
VERSION=0.9.51
echo "Running docker build with $NAME:$VERSION"
#docker rmi frikky/shuffle:$NAME --force
+9 -1
View File
@@ -37,9 +37,11 @@ import (
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/swarm"
//"github.com/docker/docker/api/types/filters"
dockerclient "github.com/docker/docker/client"
"github.com/satori/go.uuid"
uuid "github.com/satori/go.uuid"
//network "github.com/docker/docker/api/types/network"
//natting "github.com/docker/go-connections/nat"
"github.com/mackerelio/go-osstat/cpu"
@@ -538,8 +540,14 @@ func deployWorker(image string, identifier string, env []string, executionReques
nil,
identifier+"-2",
)
if err != nil {
log.Printf("[ERROR] Failed to CREATE container (2): %s", err)
}
err = dockercli.ContainerStart(context.Background(), cont.ID, containerStartOptions)
if err != nil {
log.Printf("[ERROR] Failed to start container (2): %s", err)
}
} else {
log.Printf("[ERROR] Failed initial container start. Quitting as this is NOT a simple network issue. Err: %s", err)
}