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

keep context of downloaded images

Browse Source
This commit is contained in:
yashsinghcodes
2025-08-06 04:09:52 +05:30
parent 5880cb525c
commit b332276d20
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/worker/worker.go
+10 -2
View File
@@ -840,7 +840,10 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
// Running as coroutine for eventual completeness // Running as coroutine for eventual completeness
// FIXME: With goroutines it got too much trouble of deploying with an older version // FIXME: With goroutines it got too much trouble of deploying with an older version
// Allowing slow startups, as long as it's eventually fast, and uses the same registry as on host. // Allowing slow startups, as long as it's eventually fast, and uses the same registry as on host.
shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, image) err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, image)
if err == nil {
downloadedImages = append(downloadedImages, image)
}
} }
var exposedPort int var exposedPort int
@@ -1598,6 +1601,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
executed := false executed := false
if err == nil { if err == nil {
log.Printf("[DEBUG] Downloaded image %s from backend (CLEANUP)", imageName) log.Printf("[DEBUG] Downloaded image %s from backend (CLEANUP)", imageName)
downloadedImages = append(downloadedImages, imageName)
//err = deployApp(dockercli, image, identifier, env, workflow, action) //err = deployApp(dockercli, image, identifier, env, workflow, action)
err = deployApp(dockercli, imageName, identifier, env, workflowExecution, action) err = deployApp(dockercli, imageName, identifier, env, workflowExecution, action)
if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") { if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") {
@@ -1712,6 +1716,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
executed := false executed := false
if err == nil { if err == nil {
log.Printf("[DEBUG] Downloaded image %s from backend (CLEANUP)", imageName) log.Printf("[DEBUG] Downloaded image %s from backend (CLEANUP)", imageName)
downloadedImages = append(downloadedImages, imageName)
//err = deployApp(dockercli, image, identifier, env, workflow, action) //err = deployApp(dockercli, image, identifier, env, workflow, action)
err = deployApp(dockercli, imageName, identifier, env, workflowExecution, action) err = deployApp(dockercli, imageName, identifier, env, workflowExecution, action)
if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") { if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") {
@@ -4415,7 +4420,10 @@ func handleDownloadImage(resp http.ResponseWriter, request *http.Request) {
} }
log.Printf("[INFO] Downloading image %s", imageBody.Image) log.Printf("[INFO] Downloading image %s", imageBody.Image)
shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, imageBody.Image) err = shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, imageBody.Image)
if err == nil {
downloadedImages = append(downloadedImages, imageBody.Image)
}
// return success // return success
resp.WriteHeader(200) resp.WriteHeader(200)