From 274a942e888102e552be37f951ad9514b6fbca34 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Wed, 5 Apr 2023 21:37:46 +0200
Subject: [PATCH] Fixing orborus to contain cloudrun manager

---
 functions/onprem/orborus/build.sh   | 2 +-
 functions/onprem/orborus/go.mod     | 4 ++--
 functions/onprem/orborus/orborus.go | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index fda2f4d0..d95f9ea7 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=1.1.5
+VERSION=1.1.6
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force
diff --git a/functions/onprem/orborus/go.mod b/functions/onprem/orborus/go.mod
index e9662c6f..c6a0f659 100644
--- a/functions/onprem/orborus/go.mod
+++ b/functions/onprem/orborus/go.mod
@@ -2,13 +2,13 @@ module orborus
 
 go 1.19
 
-replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared
+//replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared
 
 require (
 	github.com/docker/docker v23.0.0+incompatible
 	github.com/mackerelio/go-osstat v0.2.3
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.3.75
+	github.com/shuffle/shuffle-shared v0.4.0
 )
 
 require (
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index c2bbf2d4..7b5698cf 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -1151,6 +1151,10 @@ func main() {
 				env = append(env, fmt.Sprintf("SHUFFLE_MEMCACHED=%s", os.Getenv("SHUFFLE_MEMCACHED")))
 			}
 
+			if len(os.Getenv("SHUFFLE_CLOUDRUN_URL")) > 0 {
+				env = append(env, fmt.Sprintf("SHUFFLE_CLOUDRUN_URL=%s", os.Getenv("SHUFFLE_CLOUDRUN_URL")))
+			}
+
 			err = deployWorker(workerImage, containerName, env, execution)
 			zombiecounter += 1
 			if err == nil {