marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

siemonster :: handle empty calculated self container id

Browse Source
This commit is contained in:
Harduino
2020-08-05 12:03:23 +03:00
parent 4135f33982
commit 03ab5ba0e1
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+9 -5
View File
@@ -99,13 +99,8 @@ func getThisContainerId() string {
// Deploys the internal worker whenever something happens
func deployWorker(image string, identifier string, env []string) {
// figure out current container id
containerId := getThisContainerId()
// Binds is the actual "-v" volume.
hostConfig := &container.HostConfig{
NetworkMode: container.NetworkMode(fmt.Sprintf("container:%s", containerId)),
IpcMode: container.IpcMode(fmt.Sprintf("container:%s", containerId)),
LogConfig: container.LogConfig{
Type: "json-file",
Config: map[string]string{},
@@ -115,6 +110,15 @@ func deployWorker(image string, identifier string, env []string) {
},
}
// form container id and use it as network source if it's not empty
containerId := getThisContainerId()
if containerId != "" {
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
hostConfig.IpcMode = container.IpcMode(fmt.Sprintf("container:%s", containerId))
} else {
log.Printf("[WARNING] Empty determined container id, continue without NetworkMode/IpcMode")
}
// ROFL: https://docker-py.readthedocs.io/en/1.4.0/volumes/
config := &container.Config{
Image: image,
functions/onprem/worker/worker.go
+10 -5
View File
@@ -426,18 +426,23 @@ func getThisContainerId() string {
// Deploys the internal worker whenever something happens
func deployApp(cli *dockerclient.Client, image string, identifier string, env []string) error {
// figure out current container id
containerId := getThisContainerId()
// form basic hostConfig
hostConfig := &container.HostConfig{
NetworkMode: container.NetworkMode(fmt.Sprintf("container:%s", containerId)),
IpcMode: container.IpcMode(fmt.Sprintf("container:%s", containerId)),
LogConfig: container.LogConfig{
Type: "json-file",
Config: map[string]string{},
},
}
// form container id and use it as network source if it's not empty
containerId := getThisContainerId()
if containerId != "" {
hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
hostConfig.IpcMode = container.IpcMode(fmt.Sprintf("container:%s", containerId))
} else {
log.Printf("[WARNING] Empty determined container id, continue without NetworkMode/IpcMode")
}
config := &container.Config{
Image: image,
Env: env,