opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3355 from giuseppe/fix-typos

Browse Source 
cmd, docs, test: fix some typos
This commit is contained in:
OpenShift Merge Robot
2019-06-18 15:32:07 +02:00
committed by GitHub
parent 8bcfd24397 292a48cab4
commit 265d55edbf
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/commit.go
View File

@ -26,9 +26,9 @@ var (
commitCommand.Remote = remoteclient commitCommand.Remote = remoteclient
return commitCmd(&commitCommand) return commitCmd(&commitCommand)
}, },
Example: `podman commit -q --message "committing container to image" reverent_golick image-commited Example: `podman commit -q --message "committing container to image" reverent_golick image-committed
podman commit -q --author "firstName lastName" reverent_golick image-commited podman commit -q --author "firstName lastName" reverent_golick image-committed
podman commit -q --pause=false containerID image-commited`, podman commit -q --pause=false containerID image-committed`,
} }
) )

2
cmd/podman/shared/container.go
View File

@ -710,7 +710,7 @@ func portsToString(ports []ocicni.PortMapping) string {
} }
// GetRunlabel is a helper function for runlabel; it gets the image if needed and begins the // GetRunlabel is a helper function for runlabel; it gets the image if needed and begins the
// contruction of the runlabel output and environment variables // construction of the runlabel output and environment variables
func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtime *libpod.Runtime, pull bool, inputCreds string, dockerRegistryOptions image.DockerRegistryOptions, authfile string, signaturePolicyPath string, output io.Writer) (string, string, error) { func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtime *libpod.Runtime, pull bool, inputCreds string, dockerRegistryOptions image.DockerRegistryOptions, authfile string, signaturePolicyPath string, output io.Writer) (string, string, error) {
var ( var (
newImage *image.Image newImage *image.Image

2
cmd/podman/shared/container_inspect.go
View File

@ -108,7 +108,7 @@ type InspectContainerConfig struct {
} }
// InspectLogConfig holds information about a container's configured log driver // InspectLogConfig holds information about a container's configured log driver
// and is presently unused. It is retained for Docker compatability. // and is presently unused. It is retained for Docker compatibility.
type InspectLogConfig struct { type InspectLogConfig struct {
Type string `json:"Type"` Type string `json:"Type"`
Config map[string]string `json:"Config"` //idk type, TODO Config map[string]string `json:"Config"` //idk type, TODO

2
cmd/podman/system_df.go
View File

@ -586,7 +586,7 @@ func volumesVerboseOutput(ctx context.Context, metaData dfMetaData) error {
} }
volumesVerboseDiskUsage, err := getVolumeVerboseDiskUsage(metaData.volumes, metaData.volumeUsedByContainerMap) volumesVerboseDiskUsage, err := getVolumeVerboseDiskUsage(metaData.volumes, metaData.volumeUsedByContainerMap)
if err != nil { if err != nil {
return errors.Wrapf(err, "error getting verbose ouput of volumes") return errors.Wrapf(err, "error getting verbose output of volumes")
} }
os.Stderr.WriteString("\nLocal Volumes space usage:\n\n") os.Stderr.WriteString("\nLocal Volumes space usage:\n\n")
out := formats.StdoutTemplateArray{Output: systemDfVolumeVerboseDiskUsageToGeneric(volumesVerboseDiskUsage), Template: volumeVerboseFormat, Fields: volumeVerboseHeader} out := formats.StdoutTemplateArray{Output: systemDfVolumeVerboseDiskUsageToGeneric(volumesVerboseDiskUsage), Template: volumeVerboseFormat, Fields: volumeVerboseHeader}

2
docs/podman-build.1.md
View File

@ -172,7 +172,7 @@ value can be entered. The password is entered without echo.
This is a Docker specific option to disable image verification to a Docker This is a Docker specific option to disable image verification to a Docker
registry and is not supported by Podman. This flag is a NOOP and provided registry and is not supported by Podman. This flag is a NOOP and provided
soley for scripting compatibility. solely for scripting compatibility.
**--dns**=*dns* **--dns**=*dns*

8
docs/podman-commit.1.md
View File

@ -58,7 +58,7 @@ Suppress output
## EXAMPLES ## EXAMPLES
``` ```
$ podman commit --change CMD=/bin/bash --change ENTRYPOINT=/bin/sh --change LABEL=blue=image reverent_golick image-commited $ podman commit --change CMD=/bin/bash --change ENTRYPOINT=/bin/sh --change LABEL=blue=image reverent_golick image-committed
Getting image source signatures Getting image source signatures
Copying blob sha256:b41deda5a2feb1f03a5c1bb38c598cbc12c9ccd675f438edc6acd815f7585b86 Copying blob sha256:b41deda5a2feb1f03a5c1bb38c598cbc12c9ccd675f438edc6acd815f7585b86
25.80 MB / 25.80 MB [======================================================] 0s 25.80 MB / 25.80 MB [======================================================] 0s
@ -70,17 +70,17 @@ e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8
``` ```
``` ```
$ podman commit -q --message "committing container to image" reverent_golick image-commited $ podman commit -q --message "committing container to image" reverent_golick image-committed
e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8 e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8
``` ```
``` ```
$ podman commit -q --author "firstName lastName" reverent_golick image-commited $ podman commit -q --author "firstName lastName" reverent_golick image-committed
e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8 e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8
``` ```
``` ```
$ podman commit -q --pause=false containerID image-commited $ podman commit -q --pause=false containerID image-committed
e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8 e3ce4d93051ceea088d1c242624d659be32cf1667ef62f1d16d6b60193e2c7a8
``` ```

6
docs/podman-create.1.md
View File

@ -55,11 +55,11 @@ Block IO weight (relative weight) accepts a weight value between 10 and 1000.
Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`). Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`).
**--cap-add**=*capabilitiy* **--cap-add**=*capability*
Add Linux capabilities Add Linux capabilities
**--cap-drop**=*capabilitiy* **--cap-drop**=*capability*
Drop Linux capabilities Drop Linux capabilities
@ -382,7 +382,7 @@ Not implemented
**--log-driver**="*k8s-file*" **--log-driver**="*k8s-file*"
Logging driver for the container. Currently not supported. This flag is a NOOP provided soley for scripting compatibility. Logging driver for the container. Currently not supported. This flag is a NOOP provided solely for scripting compatibility.
**--log-opt**=*path* **--log-opt**=*path*

2
docs/podman-generate-kube.1.md
View File

@ -20,7 +20,7 @@ Output to the given file, instead of STDOUT. If the file already exists, `genera
**--service**, **-s** **--service**, **-s**
Generate a Kubernetes service object in addition to the Pods. Used to generate a Service specification for the corresponding Pod ouput. In particular, if the object has portmap bindings, the service specification will include a NodePort declaration to expose the service. A Generate a Kubernetes service object in addition to the Pods. Used to generate a Service specification for the corresponding Pod output. In particular, if the object has portmap bindings, the service specification will include a NodePort declaration to expose the service. A
random port is assigned by Podman in the specification. random port is assigned by Podman in the specification.
## Examples ## Examples

2
docs/podman-run.1.md
View File

@ -395,7 +395,7 @@ Not implemented
**--log-driver**="*k8s-file*" **--log-driver**="*k8s-file*"
Logging driver for the container. Currently not supported. This flag is a NOOP provided soley for scripting compatibility. Logging driver for the container. Currently not supported. This flag is a NOOP provided solely for scripting compatibility.
**--log-opt**=*path* **--log-opt**=*path*

2
test/utils/utils.go
View File

@ -63,7 +63,7 @@ func (p *PodmanTest) MakeOptions(args []string) []string {
return p.PodmanMakeOptions(args) return p.PodmanMakeOptions(args)
} }
// PodmanAsUserBase exec podman as user. uid and gid is set for credentials useage. env is used // PodmanAsUserBase exec podman as user. uid and gid is set for credentials usage. env is used
// to record the env for debugging // to record the env for debugging
func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, nocache bool) *PodmanSession { func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, nocache bool) *PodmanSession {
var command *exec.Cmd var command *exec.Cmd