opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 00:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22299 from lvyaoting/main

Browse Source 
[CI:DOCS] chore: fix function names in comment
This commit is contained in:
openshift-merge-bot[bot]
2024-04-09 18:00:15 +00:00
committed by GitHub
parent 52e1d38bb1 59ee130048
commit 6f4b1c10a8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/containers/ps.go
View File

@ -446,7 +446,7 @@ func (l psReporter) CreatedAt() string {
return l.Created.String() return l.Created.String()
} }
// CreateHuman allows us to output the created time in human readable format // CreatedHuman allows us to output the created time in human readable format
func (l psReporter) CreatedHuman() string { func (l psReporter) CreatedHuman() string {
return units.HumanDuration(time.Since(l.Created)) + " ago" return units.HumanDuration(time.Since(l.Created)) + " ago"
} }

2
libpod/boltdb_state.go
View File

@ -1469,7 +1469,7 @@ func (s *BoltState) GetContainerExitCodeTimeStamp(id string) (*time.Time, error)
}) })
} }
// PruneExitCodes removes exit codes older than 5 minutes unless the associated // PruneContainerExitCodes removes exit codes older than 5 minutes unless the associated
// container still exists. // container still exists.
func (s *BoltState) PruneContainerExitCodes() error { func (s *BoltState) PruneContainerExitCodes() error {
if !s.valid { if !s.valid {

2
libpod/container_internal.go
View File

@ -2482,7 +2482,7 @@ func (c *Container) hasNamespace(namespace spec.LinuxNamespaceType) bool {
return false return false
} }
// extractSecretToStorage copies a secret's data from the secrets manager to the container's static dir // extractSecretToCtrStorage copies a secret's data from the secrets manager to the container's static dir
func (c *Container) extractSecretToCtrStorage(secr *ContainerSecret) error { func (c *Container) extractSecretToCtrStorage(secr *ContainerSecret) error {
manager, err := c.runtime.SecretsManager() manager, err := c.runtime.SecretsManager()
if err != nil { if err != nil {

4
libpod/container_path_resolution.go
View File

@ -26,7 +26,7 @@ func (c *Container) pathAbs(path string) string {
return path return path
} }
// resolveContainerPaths resolves the container's mount point and the container // resolvePath resolves the container's mount point and the container
// path as specified by the user. Both may resolve to paths outside of the // path as specified by the user. Both may resolve to paths outside of the
// container's mount point when the container path hits a volume or bind mount. // container's mount point when the container path hits a volume or bind mount.
// //
@ -153,7 +153,7 @@ func isPathOnVolume(c *Container, containerPath string) bool {
return false return false
} }
// findBindMounts checks if the specified containerPath matches the destination // findBindMount checks if the specified containerPath matches the destination
// path of a Mount. Returns a matching Mount or nil. // path of a Mount. Returns a matching Mount or nil.
func findBindMount(c *Container, containerPath string) *specs.Mount { func findBindMount(c *Container, containerPath string) *specs.Mount {
cleanedPath := filepath.Clean(containerPath) cleanedPath := filepath.Clean(containerPath)