Merge pull request #12525 from mheon/bump_343

Backports for and bump to v3.4.3

2 files changed, 9 insertions, 26 deletions

diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 50d7c446d..9accae327 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -102,7 +102,9 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c
 		addField(&builder, "type", string(m.Type))
 		addField(&builder, "source", m.Source)
 		addField(&builder, "target", m.Target)
-		addField(&builder, "ro", strconv.FormatBool(m.ReadOnly))
+		if m.ReadOnly {
+			addField(&builder, "ro", "true")
+		}
 		addField(&builder, "consistency", string(m.Consistency))
 		// Map any specialized mount options that intersect between *Options and cli options
 		switch m.Type {
diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go
index fe5205669..a79c0430f 100644
--- a/cmd/podman/pods/logs.go
+++ b/cmd/podman/pods/logs.go
@@ -27,11 +27,11 @@ type logsOptionsWrapper struct {
 var (
 	logsPodOptions     logsOptionsWrapper
 	logsPodDescription = `Displays logs for pod with one or more containers.`
-	logsPodCommand     = &cobra.Command{
+	podLogsCommand     = &cobra.Command{
 		Use:   "logs [options] POD",
 		Short: "Fetch logs for pod with one or more containers",
 		Long:  logsPodDescription,
-		// We dont want users to invoke latest and pod togather
+		// We dont want users to invoke latest and pod together
 		Args: func(cmd *cobra.Command, args []string) error {
 			switch {
 			case registry.IsRemote() && logsPodOptions.Latest:
@@ -53,35 +53,16 @@ var (
 		podman pod logs --follow=true --since 10m podID
 		podman pod logs mywebserver`,
 	}
-
-	containerLogsCommand = &cobra.Command{
-		Use:               logsPodCommand.Use,
-		Short:             logsPodCommand.Short,
-		Long:              logsPodCommand.Long,
-		Args:              logsPodCommand.Args,
-		RunE:              logsPodCommand.RunE,
-		ValidArgsFunction: logsPodCommand.ValidArgsFunction,
-		Example: `podman pod logs podId
-		podman pod logs -c ctrname podName
-		podman pod logs --tail 2 mywebserver
-		podman pod logs --follow=true --since 10m podID`,
-	}
 )
 
 func init() {
+	// pod logs
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Command: logsPodCommand,
-	})
-	logsFlags(logsPodCommand)
-	validate.AddLatestFlag(logsPodCommand, &logsPodOptions.Latest)
-
-	// container logs
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Command: containerLogsCommand,
+		Command: podLogsCommand,
 		Parent:  podCmd,
 	})
-	logsFlags(containerLogsCommand)
-	validate.AddLatestFlag(containerLogsCommand, &logsPodOptions.Latest)
+	logsFlags(podLogsCommand)
+	validate.AddLatestFlag(podLogsCommand, &logsPodOptions.Latest)
 }
 
 func logsFlags(cmd *cobra.Command) {