Merge pull request #234 from AkihiroSuda/fix-compose

Fix compose regressions
containerd · Jun 2, 2021 · 487f94a · 487f94a
2 parents f6c5862 + 48b7b93
commit 487f94a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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)

diff --git 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)
 }