Skip to content

Fix compose regressions #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 2 commits into from
Jun 2, 2021
Merged

Fix compose regressions #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93c4ad
Fix `compose logs: level=fatal msg="requires exactly 1 argument"`
AkihiroSuda Jun 2, 2021
48b7b93
Fix `...volumes/default/compose-wordpress_wordpress/_data" is not ini…
AkihiroSuda Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/composer/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion run_mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}