Resolve merge conflicts

docker · Sep 15, 2022 · e425f78 · e425f78
1 parent adbb96e
commit e425f78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/vm/internal/handler/sizes.go b/vm/internal/handler/sizes.go
@@ -13,7 +13,10 @@ func (h *Handler) VolumesSize(ctx echo.Context) error {
 		return err
 	}
 
-	m := backend.GetVolumesSize(ctx.Request().Context(), cli, "*")
+	m, err := backend.GetVolumesSize(ctx.Request().Context(), cli, "*")
+	if err != nil {
+		return err
+	}
 
 	return ctx.JSON(http.StatusOK, m)
 }
diff --git a/vm/internal/handler/volumes.go b/vm/internal/handler/volumes.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/docker/docker/api/types/filters
+	"github.com/docker/docker/api/types/filters"
 	"github.com/labstack/echo"
 )
 
@@ -28,7 +28,7 @@ func (h *Handler) Volumes(ctx echo.Context) error {
 		return err
 	}
 
-	v, err := cli.VolumeList(ctx.Request().Context(), filters.NewArgs())
+	v, err := cli.VolumeList(ctxReq, filters.NewArgs())
 	if err != nil {
 		return err
 	}