retry tasks at least once

damoon · Nov 23, 2020 · 31d8579 · 31d8579
1 parent 94875d2
commit 31d8579
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pkg/inspect.go b/pkg/inspect.go
@@ -20,10 +20,11 @@ func (s Service) inspect(w http.ResponseWriter, r *http.Request) {
 	script := fmt.Sprintf(`
 set -euo pipefail
 mkdir %s
-skopeo copy --quiet --retry-times 3 --src-tls-verify=false docker://%s dir://%s
+skopeo copy --quiet --retry-times 3 --src-tls-verify=false docker://%s dir://%s || \
+	skopeo copy --quiet --retry-times 3 --src-tls-verify=false docker://%s dir://%s
 skopeo inspect dir://%s
 rm -r %s
-`, randomID, image, randomID, randomID, randomID)
+`, randomID, image, randomID, image, randomID, randomID, randomID)
 
 	ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
 	defer cancel()

diff --git a/pkg/pull.go b/pkg/pull.go
@@ -76,7 +76,7 @@ func (s Service) pullImage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	o := &output{w: w}
-	err = scheduler(r.Context(), o, "pull", script, dockerCfg.mustToJSON())
+	err = scheduler(r.Context(), o, "pull", script+" || "+script, dockerCfg.mustToJSON())
 	if err != nil {
 		log.Printf("execute pull: %v", err)
 		o.Errorf("execute pull: %v", err)

diff --git a/pkg/push.go b/pkg/push.go
@@ -42,7 +42,7 @@ func (s Service) pushImage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	o := &output{w: w}
-	err = scheduler(r.Context(), o, "push", script, dockerCfg.mustToJSON())
+	err = scheduler(r.Context(), o, "push", script+" || "+script, dockerCfg.mustToJSON())
 	if err != nil {
 		log.Printf("execute push: %v", err)
 		o.Errorf("execute push: %v", err)

diff --git a/pkg/tag.go b/pkg/tag.go
@@ -50,7 +50,7 @@ func (s Service) tagImage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	o := &bytes.Buffer{}
-	err = scheduler(r.Context(), o, "tag", script, "")
+	err = scheduler(r.Context(), o, "tag", script+" || "+script, "")
 	if err != nil {
 		log.Printf("execute tag: %v", err)
 		w.WriteHeader(http.StatusInternalServerError)