Skip to content

Commit

Permalink
Merge pull request #10772 from juanvallejo/jvallejo_oc-rsh-suggest-fl…
Browse files Browse the repository at this point in the history
…ags-before-resource-name

Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Sep 27, 2016
2 parents 086c1a6 + fab0d0a commit 129c66c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
11 changes: 6 additions & 5 deletions docs/man/man1/oc-rsh.1
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ This command will attempt to start a shell session in a pod for the specified re
It works with pods, deployment configs, jobs, daemon sets, and replication controllers.
Any of the aforementioned resources (apart from pods) will be resolved to a ready pod.
It will default to the first container if none is specified, and will attempt to use
'/bin/sh' as the default shell. You may pass an optional command after the resource name,
which will be executed instead of a login shell. A TTY will be automatically allocated
if standard input is interactive \- use \-t and \-T to override. A TERM variable is sent
to the environment where the shell (or command) will be executed. By default its value
is the same as the TERM variable from the local environment; if not set, 'xterm' is used.
'/bin/sh' as the default shell. You may pass any flags supported by this command before
the resource name, and an optional command after the resource name, which will be executed
instead of a login shell. A TTY will be automatically allocated if standard input is
interactive \- use \-t and \-T to override. A TERM variable is sent to the environment where
the shell (or command) will be executed. By default its value is the same as the TERM
variable from the local environment; if not set, 'xterm' is used.

.PP
Note, some containers may not include a shell \- use 'oc exec' if you need to run commands
Expand Down
11 changes: 6 additions & 5 deletions docs/man/man1/openshift-cli-rsh.1
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ This command will attempt to start a shell session in a pod for the specified re
It works with pods, deployment configs, jobs, daemon sets, and replication controllers.
Any of the aforementioned resources (apart from pods) will be resolved to a ready pod.
It will default to the first container if none is specified, and will attempt to use
'/bin/sh' as the default shell. You may pass an optional command after the resource name,
which will be executed instead of a login shell. A TTY will be automatically allocated
if standard input is interactive \- use \-t and \-T to override. A TERM variable is sent
to the environment where the shell (or command) will be executed. By default its value
is the same as the TERM variable from the local environment; if not set, 'xterm' is used.
'/bin/sh' as the default shell. You may pass any flags supported by this command before
the resource name, and an optional command after the resource name, which will be executed
instead of a login shell. A TTY will be automatically allocated if standard input is
interactive \- use \-t and \-T to override. A TERM variable is sent to the environment where
the shell (or command) will be executed. By default its value is the same as the TERM
variable from the local environment; if not set, 'xterm' is used.

.PP
Note, some containers may not include a shell \- use 'openshift cli exec' if you need to run commands
Expand Down
11 changes: 6 additions & 5 deletions pkg/cmd/cli/cmd/rsh.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ This command will attempt to start a shell session in a pod for the specified re
It works with pods, deployment configs, jobs, daemon sets, and replication controllers.
Any of the aforementioned resources (apart from pods) will be resolved to a ready pod.
It will default to the first container if none is specified, and will attempt to use
'/bin/sh' as the default shell. You may pass an optional command after the resource name,
which will be executed instead of a login shell. A TTY will be automatically allocated
if standard input is interactive - use -t and -T to override. A TERM variable is sent
to the environment where the shell (or command) will be executed. By default its value
is the same as the TERM variable from the local environment; if not set, 'xterm' is used.
'/bin/sh' as the default shell. You may pass any flags supported by this command before
the resource name, and an optional command after the resource name, which will be executed
instead of a login shell. A TTY will be automatically allocated if standard input is
interactive - use -t and -T to override. A TERM variable is sent to the environment where
the shell (or command) will be executed. By default its value is the same as the TERM
variable from the local environment; if not set, 'xterm' is used.
Note, some containers may not include a shell - use '%[1]s exec' if you need to run commands
directly.`
Expand Down

0 comments on commit 129c66c

Please sign in to comment.