From 84b4d942bc8192cd17ea49bd8edca207ba19fb37 Mon Sep 17 00:00:00 2001 From: apostasie Date: Thu, 17 Oct 2024 13:38:06 -0700 Subject: [PATCH] Change compose lock to use DataStore() Signed-off-by: apostasie --- pkg/cmd/compose/compose.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/compose/compose.go b/pkg/cmd/compose/compose.go index f9254d2e21f..5dde0b825e4 100644 --- a/pkg/cmd/compose/compose.go +++ b/pkg/cmd/compose/compose.go @@ -30,6 +30,7 @@ import ( "github.com/containerd/platforms" "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" "github.com/containerd/nerdctl/v2/pkg/cmd/volume" "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" @@ -55,7 +56,11 @@ func New(client *containerd.Client, globalOptions types.GlobalCommandOptions, op // Note that we do not close the lock explicitly. Instead, the lock will get released when the `locked` global // variable will get collected and the file descriptor closed (eg: when the binary exits). var err error - locked, err = lockutil.Lock(globalOptions.DataRoot) + dataStore, err := clientutil.DataStore(globalOptions.DataRoot, globalOptions.Address) + if err != nil { + return nil, err + } + locked, err = lockutil.Lock(dataStore) if err != nil { return nil, err }