Added small fixes to orborus and sdk
This commit is contained in:
@@ -2612,7 +2612,13 @@ class AppBase:
|
|||||||
for i in range(0, curminlength):
|
for i in range(0, curminlength):
|
||||||
tmpitem = json.loads(json.dumps(parameter["value"]))
|
tmpitem = json.loads(json.dumps(parameter["value"]))
|
||||||
for key, value in replacements.items():
|
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("\""):
|
if replacement.startswith("\"") and replacement.endswith("\""):
|
||||||
replacement = replacement[1:len(replacement)-1]
|
replacement = replacement[1:len(replacement)-1]
|
||||||
#except json.decoder.JSONDecodeError as e:
|
#except json.decoder.JSONDecodeError as e:
|
||||||
|
|||||||
+1
-1
@@ -64,7 +64,7 @@ services:
|
|||||||
- SHUFFLE_SWARM_CONFIG=runn
|
- SHUFFLE_SWARM_CONFIG=runn
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
opensearch:
|
opensearch:
|
||||||
image: opensearchproject/opensearch:1.2.3
|
image: opensearchproject/opensearch:1.2.4
|
||||||
hostname: shuffle-opensearch
|
hostname: shuffle-opensearch
|
||||||
container_name: shuffle-opensearch
|
container_name: shuffle-opensearch
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
NAME=shuffle-orborus
|
NAME=shuffle-orborus
|
||||||
VERSION=0.9.50
|
VERSION=0.9.51
|
||||||
|
|
||||||
echo "Running docker build with $NAME:$VERSION"
|
echo "Running docker build with $NAME:$VERSION"
|
||||||
#docker rmi frikky/shuffle:$NAME --force
|
#docker rmi frikky/shuffle:$NAME --force
|
||||||
|
|||||||
@@ -37,9 +37,11 @@ import (
|
|||||||
"github.com/docker/docker/api/types/mount"
|
"github.com/docker/docker/api/types/mount"
|
||||||
"github.com/docker/docker/api/types/network"
|
"github.com/docker/docker/api/types/network"
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
|
|
||||||
//"github.com/docker/docker/api/types/filters"
|
//"github.com/docker/docker/api/types/filters"
|
||||||
dockerclient "github.com/docker/docker/client"
|
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"
|
//network "github.com/docker/docker/api/types/network"
|
||||||
//natting "github.com/docker/go-connections/nat"
|
//natting "github.com/docker/go-connections/nat"
|
||||||
"github.com/mackerelio/go-osstat/cpu"
|
"github.com/mackerelio/go-osstat/cpu"
|
||||||
@@ -538,8 +540,14 @@ func deployWorker(image string, identifier string, env []string, executionReques
|
|||||||
nil,
|
nil,
|
||||||
identifier+"-2",
|
identifier+"-2",
|
||||||
)
|
)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("[ERROR] Failed to CREATE container (2): %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
err = dockercli.ContainerStart(context.Background(), cont.ID, containerStartOptions)
|
err = dockercli.ContainerStart(context.Background(), cont.ID, containerStartOptions)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("[ERROR] Failed to start container (2): %s", err)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Printf("[ERROR] Failed initial container start. Quitting as this is NOT a simple network issue. Err: %s", err)
|
log.Printf("[ERROR] Failed initial container start. Quitting as this is NOT a simple network issue. Err: %s", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user