containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3872 from baude/3861 

podman-remote: cp crashes
This commit is contained in:
OpenShift Merge Robot 2019-08-22 03:42:11 -07:00 committed by GitHub
parent 34f902572d e06d0fe5e5
commit 18f2328264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/commands.go
View File

@ -11,6 +11,7 @@ const remoteclient = false
// Commands that the local client implements // Commands that the local client implements
func getMainCommands() []*cobra.Command { func getMainCommands() []*cobra.Command {
rootCommands := []*cobra.Command{ rootCommands := []*cobra.Command{
_cpCommand,
_playCommand, _playCommand,
_loginCommand, _loginCommand,
_logoutCommand, _logoutCommand,
@ -39,6 +40,7 @@ func getImageSubCommands() []*cobra.Command {
func getContainerSubCommands() []*cobra.Command { func getContainerSubCommands() []*cobra.Command {
return []*cobra.Command{ return []*cobra.Command{
_cpCommand,
_cleanupCommand, _cleanupCommand,
_mountCommand, _mountCommand,
_refreshCommand, _refreshCommand,

1
cmd/podman/container.go
View File

@ -55,7 +55,6 @@ var (
_commitCommand, _commitCommand,
_containerExistsCommand, _containerExistsCommand,
_contInspectSubCommand, _contInspectSubCommand,
_cpCommand,
_diffCommand, _diffCommand,
_execCommand, _execCommand,
_exportCommand, _exportCommand,

1
cmd/podman/cp.go
View File

@ -55,7 +55,6 @@ func init() {
flags.BoolVar(&cpCommand.Pause, "pause", false, "Pause the container while copying") flags.BoolVar(&cpCommand.Pause, "pause", false, "Pause the container while copying")
cpCommand.SetHelpTemplate(HelpTemplate()) cpCommand.SetHelpTemplate(HelpTemplate())
cpCommand.SetUsageTemplate(UsageTemplate()) cpCommand.SetUsageTemplate(UsageTemplate())
rootCmd.AddCommand(cpCommand.Command)
} }
func cpCmd(c *cliconfig.CpValues) error { func cpCmd(c *cliconfig.CpValues) error {

10
cmd/podman/shared/intermediate.go
View File

@ -114,7 +114,7 @@ func (f GenericCLIResults) findResult(flag string) GenericCLIResult {
if ok { if ok {
return val return val
} }
logrus.Errorf("unable to find flag %s", flag) logrus.Debugf("unable to find flag %s", flag)
return nil return nil
} }
@ -366,12 +366,10 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["add-host"] = newCRStringSlice(c, "add-host") m["add-host"] = newCRStringSlice(c, "add-host")
m["annotation"] = newCRStringSlice(c, "annotation") m["annotation"] = newCRStringSlice(c, "annotation")
m["attach"] = newCRStringSlice(c, "attach") m["attach"] = newCRStringSlice(c, "attach")
m["authfile"] = newCRString(c, "authfile")
m["blkio-weight"] = newCRString(c, "blkio-weight") m["blkio-weight"] = newCRString(c, "blkio-weight")
m["blkio-weight-device"] = newCRStringSlice(c, "blkio-weight-device") m["blkio-weight-device"] = newCRStringSlice(c, "blkio-weight-device")
m["cap-add"] = newCRStringSlice(c, "cap-add") m["cap-add"] = newCRStringSlice(c, "cap-add")
m["cap-drop"] = newCRStringSlice(c, "cap-drop") m["cap-drop"] = newCRStringSlice(c, "cap-drop")
m["cgroupns"] = newCRString(c, "cgroupns")
m["cgroup-parent"] = newCRString(c, "cgroup-parent") m["cgroup-parent"] = newCRString(c, "cgroup-parent")
m["cidfile"] = newCRString(c, "cidfile") m["cidfile"] = newCRString(c, "cidfile")
m["conmon-pidfile"] = newCRString(c, "conmon-pidfile") m["conmon-pidfile"] = newCRString(c, "conmon-pidfile")
@ -395,7 +393,6 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["dns-search"] = newCRStringSlice(c, "dns-search") m["dns-search"] = newCRStringSlice(c, "dns-search")
m["entrypoint"] = newCRString(c, "entrypoint") m["entrypoint"] = newCRString(c, "entrypoint")
m["env"] = newCRStringArray(c, "env") m["env"] = newCRStringArray(c, "env")
m["env-host"] = newCRBool(c, "env-host")
m["env-file"] = newCRStringSlice(c, "env-file") m["env-file"] = newCRStringSlice(c, "env-file")
m["expose"] = newCRStringSlice(c, "expose") m["expose"] = newCRStringSlice(c, "expose")
m["gidmap"] = newCRStringSlice(c, "gidmap") m["gidmap"] = newCRStringSlice(c, "gidmap")
@ -407,7 +404,6 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["healthcheck-start-period"] = newCRString(c, "health-start-period") m["healthcheck-start-period"] = newCRString(c, "health-start-period")
m["healthcheck-timeout"] = newCRString(c, "health-timeout") m["healthcheck-timeout"] = newCRString(c, "health-timeout")
m["hostname"] = newCRString(c, "hostname") m["hostname"] = newCRString(c, "hostname")
m["http-proxy"] = newCRBool(c, "http-proxy")
m["image-volume"] = newCRString(c, "image-volume") m["image-volume"] = newCRString(c, "image-volume")
m["init"] = newCRBool(c, "init") m["init"] = newCRBool(c, "init")
m["init-path"] = newCRString(c, "init-path") m["init-path"] = newCRString(c, "init-path")
@ -465,6 +461,10 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["workdir"] = newCRString(c, "workdir") m["workdir"] = newCRString(c, "workdir")
// global flag // global flag
if !remote { if !remote {
m["authfile"] = newCRString(c, "authfile")
m["cgroupns"] = newCRString(c, "cgroupns")
m["env-host"] = newCRBool(c, "env-host")
m["http-proxy"] = newCRBool(c, "http-proxy")
m["trace"] = newCRBool(c, "trace") m["trace"] = newCRBool(c, "trace")
m["syslog"] = newCRBool(c, "syslog") m["syslog"] = newCRBool(c, "syslog")
} }