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

Nightly orborus rebuild

Browse Source
This commit is contained in:
Frikky
2025-10-03 13:42:11 +02:00
parent b039222117
commit d56b631b07
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/walkoff.go
+1 -2
View File
@@ -1847,13 +1847,12 @@ func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
workflowapps, err := shuffle.GetAllWorkflowApps(ctx, 1000, 0)
if err != nil {
log.Printf("{WARNING] Failed getting apps (getworkflowapps): %s", err)
resp.WriteHeader(401)
resp.WriteHeader(400)
resp.Write([]byte(`{"success": false}`))
return
}
newapps := workflowapps
if len(user.PrivateApps) > 0 {
found := false
for _, item := range user.PrivateApps {
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/go-connections v0.5.0
github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.9.15
github.com/shuffle/shuffle-shared v0.9.26
k8s.io/api v0.33.1
k8s.io/apimachinery v0.33.1
)
functions/onprem/orborus/go.sum
+2 -2
View File
@@ -328,8 +328,8 @@ github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1G
github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/shuffle/shuffle-shared v0.9.15 h1:Gc7c0pbWG6nHWSTkcfAnKgQgWCWfc6aDQ/BIu20z6bM=
github.com/shuffle/shuffle-shared v0.9.15/go.mod h1:PhDEizuz4SmJaSmy0+yrFWwD1mXVUsy8/knKlrqF1qw=
github.com/shuffle/shuffle-shared v0.9.26 h1:D7ZSnRGROtEP7eNprmYuc1wcxa+kV7bY5M+HFrOo990=
github.com/shuffle/shuffle-shared v0.9.26/go.mod h1:PhDEizuz4SmJaSmy0+yrFWwD1mXVUsy8/knKlrqF1qw=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
functions/onprem/orborus/orborus.go
+23 -11
View File
@@ -1571,12 +1571,12 @@ func initializeImages() {
if appSdkVersion == "" {
appSdkVersion = "latest"
log.Printf("[WARNING] SHUFFLE_APP_SDK_VERSION not defined. Defaulting to %#v", appSdkVersion)
log.Printf("[INFO] SHUFFLE_APP_SDK_VERSION not defined. Defaulting to %#v", appSdkVersion)
}
if workerVersion == "" {
workerVersion = "latest"
log.Printf("[WARNING] SHUFFLE_WORKER_VERSION not defined. Defaulting to %#v", workerVersion)
log.Printf("[INFO] SHUFFLE_WORKER_VERSION not defined. Defaulting to %#v", workerVersion)
}
if baseimageregistry == "" {
@@ -1591,7 +1591,7 @@ func initializeImages() {
os.Setenv("SHUFFLE_BASE_IMAGE_REGISTRY", baseimageregistry)
log.Printf("[WARNING] Setting baseimageregistry to %#v", baseimageregistry)
log.Printf("[INFO] Setting baseimageregistry to %#v", baseimageregistry)
}
if baseimagename == "" {
@@ -1600,7 +1600,7 @@ func initializeImages() {
baseimagename = "frikky/shuffle" // Dockerhub
os.Setenv("SHUFFLE_BASE_IMAGE_NAME", baseimagename)
log.Printf("[WARNING] Setting baseimagename to %#v", baseimagename)
log.Printf("[INFO] Setting baseimagename to %#v", baseimagename)
}
// Old sane default overrides:
@@ -2860,15 +2860,20 @@ func deployTenzirNode() error {
ctx := context.Background()
cacheKey := "tenzir-key"
imageName := "frikky/shuffle:tenzir"
containerName := "tenzir-node"
containerStartOptions := container.StartOptions{}
_, err = shuffle.GetCache(ctx, cacheKey)
if err == nil {
return nil
}
imageName := "frikky/shuffle:tenzir"
if os.Getenv("TENZIR_IMAGE_NAME") != "" {
imageName = os.Getenv("TENZIR_IMAGE_NAME")
log.Printf("[INFO] Using custom Tenzir image name: %s", imageName)
}
containerName := "tenzir-node"
containerStartOptions := container.StartOptions{}
containerInfo, err := dockercli.ContainerInspect(ctx, containerName)
if err != nil {
if dockerclient.IsErrNotFound(err) {
@@ -2909,7 +2914,7 @@ func deployTenzirNode() error {
}
} else {
if !containerInfo.State.Running {
log.Printf("[DEBUG] Tenzir Node exists but is not running. Restarting it.")
log.Printf("[DEBUG] Tenzir Node exists, but is not running. Restarting it.")
err := dockercli.ContainerStart(ctx, containerName, containerStartOptions)
if err != nil {
log.Printf("[ERROR] Failed to start Tenzir Node container: %v", err)
@@ -3144,7 +3149,7 @@ func createNetworkIfNotExists(ctx context.Context, networkName, subnet, gateway
}
func checkTenzirNode() error {
if os.Getenv("SHUFFLE_SKIP_PIPELINES") == "true" {
if os.Getenv("SHUFFLE_SKIP_PIPELINES") == "true" && os.Getenv("SHUFFLE_PIPELINE_ENABLED") == "false" {
return errors.New("Pipelines are disabled by user with SHUFFLE_SKIP_PIPELINES")
}
@@ -3480,7 +3485,14 @@ func handleFileCategoryChange() error {
}
if len(pipelineApikey) == 0 {
return errors.New("Shuffle API-key not set for Pipelines: SHUFFLE_PIPELINE_AUTH=<apikey>")
//var auth = os.Getenv("AUTH")
//var org = os.Getenv("ORG")
if len(auth) > 0 && len(org) > 0 {
pipelineApikey = auth
} else {
return errors.New("Shuffle API-key not set for Pipelines: SHUFFLE_PIPELINE_AUTH=<apikey>")
}
}
req.Header.Add("Authorization", "Bearer "+pipelineApikey)