From b93c4ada86ee47c942041f741b94fea70b175183 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 2 Jun 2021 17:08:10 +0900 Subject: [PATCH 1/2] Fix `compose logs: level=fatal msg="requires exactly 1 argument"` Fix #233 Signed-off-by: Akihiro Suda --- pkg/composer/logs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/composer/logs.go b/pkg/composer/logs.go index d06be0ff214..a85510f11dd 100644 --- a/pkg/composer/logs.go +++ b/pkg/composer/logs.go @@ -90,8 +90,8 @@ func (c *Composer) logs(ctx context.Context, containers map[string]serviceparser if lo.Tail == "all" { args = append(args, "+0") } else { + args = append(args, lo.Tail) } - args = append(args, lo.Tail) } args = append(args, id) From 48b7b93875d119968801eedcad43625c9394b95b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 2 Jun 2021 17:13:49 +0900 Subject: [PATCH 2/2] Fix `...volumes/default/compose-wordpress_wordpress/_data" is not initially empty` Fix #232 Signed-off-by: Akihiro Suda --- run_mount.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run_mount.go b/run_mount.go index 442a685030d..a70c90e58b2 100644 --- a/run_mount.go +++ b/run_mount.go @@ -184,7 +184,8 @@ func copyExistingContents(source, destination string) error { return err } if len(dstList) != 0 { - return errors.Errorf("volume at %q is not initially empty", destination) + // not an error, see https://github.com/containerd/nerdctl/issues/232 + logrus.Debugf("volume at %q is not initially empty", destination) } return fs.CopyDir(destination, source) }