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

Minor recommendation change

Browse Source
This commit is contained in:
frikky
2023-03-17 00:40:02 +01:00
parent c47118b922 626c821cac
commit b3fa2e8377
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/docker.go
+2 -7
View File
@@ -620,7 +620,7 @@ func hookTest() {
} }
} }
//https://stackoverflow.com/questions/23935141/how-to-copy-docker-images-from-one-host-to-another-without-using-a-repository // https://stackoverflow.com/questions/23935141/how-to-copy-docker-images-from-one-host-to-another-without-using-a-repository
func getDockerImage(resp http.ResponseWriter, request *http.Request) { func getDockerImage(resp http.ResponseWriter, request *http.Request) {
cors := shuffle.HandleCors(resp, request) cors := shuffle.HandleCors(resp, request)
if cors { if cors {
@@ -643,14 +643,9 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
return return
} }
type requestCheck struct {
Name string `datastore:"name" json:"name" yaml:"name"`
}
// This has to be done in a weird way because Datastore doesn't // This has to be done in a weird way because Datastore doesn't
// support map[string]interface and similar (openapi3.Swagger) // support map[string]interface and similar (openapi3.Swagger)
var version requestCheck var version shuffle.DockerRequestCheck
err = json.Unmarshal(body, &version) err = json.Unmarshal(body, &version)
if err != nil { if err != nil {
resp.WriteHeader(422) resp.WriteHeader(422)
backend/go-app/main.go
+1
View File
@@ -5977,6 +5977,7 @@ func initHandlers() {
r.HandleFunc("/api/v1/workflows/{key}", deleteWorkflow).Methods("DELETE", "OPTIONS") r.HandleFunc("/api/v1/workflows/{key}", deleteWorkflow).Methods("DELETE", "OPTIONS")
r.HandleFunc("/api/v1/workflows/{key}", shuffle.SaveWorkflow).Methods("PUT", "OPTIONS") r.HandleFunc("/api/v1/workflows/{key}", shuffle.SaveWorkflow).Methods("PUT", "OPTIONS")
r.HandleFunc("/api/v1/workflows/{key}", shuffle.GetSpecificWorkflow).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/workflows/{key}", shuffle.GetSpecificWorkflow).Methods("GET", "OPTIONS")
r.HandleFunc("/api/v1/workflows/recommend", shuffle.RecommendAction).Methods("POST", "OPTIONS")
// Triggers // Triggers
r.HandleFunc("/api/v1/hooks/new", shuffle.HandleNewHook).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/hooks/new", shuffle.HandleNewHook).Methods("POST", "OPTIONS")
functions/onprem/orborus/build.sh
+2 -2
View File
@@ -1,9 +1,9 @@
NAME=shuffle-orborus NAME=shuffle-orborus
VERSION=1.1.4 VERSION=1.1.5
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
docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly -t ghcr.io/shuffle/$NAME:$VERSION -t ghcr.io/shuffle/$NAME:nightly
#docker push frikky/$NAME:$VERSION #docker push frikky/$NAME:$VERSION
# docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION # docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
functions/onprem/orborus/go.mod
+1 -1
View File
@@ -8,7 +8,7 @@ require (
github.com/docker/docker v23.0.0+incompatible github.com/docker/docker v23.0.0+incompatible
github.com/mackerelio/go-osstat v0.2.3 github.com/mackerelio/go-osstat v0.2.3
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.3.59 github.com/shuffle/shuffle-shared v0.3.66
) )
require ( require (
functions/onprem/orborus/orborus.go
+1
View File
@@ -1163,6 +1163,7 @@ func main() {
} }
// Removes handled workflows (worker is made) // Removes handled workflows (worker is made)
//log.Printf("\n\n[INFO] Removing %d executions from queue\n\n", len(toBeRemoved.Data))
if len(toBeRemoved.Data) > 0 { if len(toBeRemoved.Data) > 0 {
confirmUrl := fmt.Sprintf("%s/api/v1/workflows/queue/confirm", baseUrl) confirmUrl := fmt.Sprintf("%s/api/v1/workflows/queue/confirm", baseUrl)