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

Orborus version bump for minor k8s fix

Browse Source
This commit is contained in:
frikky
2022-11-08 14:42:41 +01:00
parent 8a8fe1f9f9
commit 2b850a08a1
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/build.sh
+1 -1
View File
@@ -2,7 +2,7 @@
### DEFAULT ### DEFAULT
NAME=shuffle-app_sdk NAME=shuffle-app_sdk
VERSION=1.0.6 VERSION=1.0.9
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly
backend/app_sdk/requirements.txt
+1 -1
View File
@@ -1,7 +1,7 @@
urllib3==1.26.5 urllib3==1.26.5
requests==2.25.1 requests==2.25.1
MarkupSafe==2.0.1 MarkupSafe==2.0.1
liquidpy==0.7.5 liquidpy==0.7.6
flask[async]==2.0.2 flask[async]==2.0.2
waitress==2.1.0 waitress==2.1.0
#flask==1.1.2 #flask==1.1.2
functions/onprem/orborus/build.sh
+5 -1
View File
@@ -1,5 +1,5 @@
NAME=shuffle-orborus NAME=shuffle-orborus
VERSION=1.0.7 VERSION=1.0.9
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
@@ -10,3 +10,7 @@ docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$
docker push frikky/shuffle:$NAME docker push frikky/shuffle:$NAME
docker push ghcr.io/frikky/$NAME:$VERSION docker push ghcr.io/frikky/$NAME:$VERSION
docker push ghcr.io/frikky/$NAME:nightly docker push ghcr.io/frikky/$NAME:nightly
docker push shuffle/shuffle:$NAME
docker push ghcr.io/shuffle/$NAME:$VERSION
docker push ghcr.io/shuffle/$NAME:nightly
functions/onprem/orborus/go.mod
+1 -1
View File
@@ -8,5 +8,5 @@ require (
github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-connections v0.4.0 // indirect
github.com/mackerelio/go-osstat v0.2.1 github.com/mackerelio/go-osstat v0.2.1
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.3.5 github.com/shuffle/shuffle-shared v0.3.15
) )
functions/onprem/orborus/orborus.go
+4 -4
View File
@@ -956,7 +956,7 @@ func main() {
} }
} }
client.Timeout = 10 * time.Second client.Timeout = 30 * time.Second
fullUrl := fmt.Sprintf("%s/api/v1/workflows/queue", baseUrl) fullUrl := fmt.Sprintf("%s/api/v1/workflows/queue", baseUrl)
req, err := http.NewRequest( req, err := http.NewRequest(
@@ -986,11 +986,11 @@ func main() {
hasStarted := false hasStarted := false
for { for {
//go getStats() //go getStats()
//log.Printf("Prerequest") log.Printf("[DEBUG] Prerequest - queue")
//log.Printf("Postrequest")
newresp, err := client.Do(req) newresp, err := client.Do(req)
log.Printf("[DEBUG] Postrequest - queue")
if err != nil { if err != nil {
log.Printf("[WARNING] Failed making request: %s", err) log.Printf("[WARNING] Failed making request to %s: %s", fullUrl, err)
zombiecounter += 1 zombiecounter += 1
if zombiecounter*sleepTime > workerTimeout { if zombiecounter*sleepTime > workerTimeout {