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

moved container auto find for orborus to init

Browse Source
This commit is contained in:
yashsinghcodes
2025-11-24 17:58:53 +05:30
parent b1f23f814e
commit cb9c9236b3
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/go.mod
+1 -1
View File
@@ -10,7 +10,7 @@ require (
github.com/docker/docker v28.3.3+incompatible github.com/docker/docker v28.3.3+incompatible
github.com/docker/go-connections v0.5.0 github.com/docker/go-connections v0.5.0
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.9.58 github.com/shuffle/shuffle-shared v0.9.59
k8s.io/api v0.33.1 k8s.io/api v0.33.1
k8s.io/apimachinery v0.33.1 k8s.io/apimachinery v0.33.1
) )
functions/onprem/orborus/orborus.go
+22 -20
View File
@@ -142,6 +142,28 @@ func init() {
log.Printf("Unable to create docker client: %s", err) log.Printf("Unable to create docker client: %s", err)
} }
if os.Getenv("SHUFFLE_EC2_INSTANCE") == "true" {
log.Printf("[INFO] Detected AWS EC2 instance. Setting up Docker Swarm with AWS optimizations.")
containers, err := dockercli.ContainerList(context.Background(), container.ListOptions{})
if err == nil {
for _, container := range containers {
if strings.Contains(container.Image, "shuffle-orborus") {
if len(container.Names) != 0 {
if strings.Contains(container.Names[0], "shuffle-orborus") {
containerName = container.Names[0]
containerName = strings.TrimPrefix(containerName, "/")
os.Setenv("ORBORUS_CONTAINER_NAME", containerName)
log.Printf("[DEBUG] Found orborus container name: %s", containerName)
break
}
}
}
}
} else {
log.Printf("[ERROR] Failed to find orborus container: %s", err)
}
}
getThisContainerId() getThisContainerId()
if len(pipelineApikey) == 0 { if len(pipelineApikey) == 0 {
@@ -2416,26 +2438,6 @@ func main() {
} }
if swarmConfig == "run" || swarmConfig == "swarm" || isKubernetes == "true" { if swarmConfig == "run" || swarmConfig == "swarm" || isKubernetes == "true" {
if os.Getenv("SHUFFLE_EC2_INSTANCE") == "true" {
log.Printf("[INFO] Detected AWS EC2 instance. Setting up Docker Swarm with AWS optimizations.")
containers, err := dockercli.ContainerList(ctx, container.ListOptions{})
if err == nil {
for _, container := range containers {
if strings.Contains(container.Image, "shuffle-orborus") {
if len(container.Names) != 0 {
if strings.Contains(container.Names[0], "shuffle-orborus") {
containerName = container.Names[0]
containerName = strings.TrimPrefix(containerName, "/")
os.Setenv("ORBORUS_CONTAINER_NAME", containerName)
log.Printf("[DEBUG] Found orborus container name: %s", containerName)
}
}
}
}
} else {
log.Printf("[ERROR] Failed to find orborus container: %s", err)
}
}
if isKubernetes != "true" { if isKubernetes != "true" {
checkSwarmService(ctx) checkSwarmService(ctx)