diff options
| author | Naveen <172697+naveensrinivasan@users.noreply.github.com> | 2022-04-02 16:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 16:29:37 -0500 |
| commit | 6375a85055b4472846445a37464851429edfa447 (patch) | |
| tree | a296f777fa928beaa40c6e9731d4df161d08d91e /pkg/specgenutil | |
| parent | 9cacc18c951d4497b5979f96d829c86ca41f777f (diff) | |
| parent | d4394ea3688ad1942b8457f6df869f7c440d49e7 (diff) | |
| download | podman-6375a85055b4472846445a37464851429edfa447.tar.gz podman-6375a85055b4472846445a37464851429edfa447.tar.bz2 podman-6375a85055b4472846445a37464851429edfa447.zip | |
Merge branch 'containers:main' into naveen/feat/set-perms-actions
Diffstat (limited to 'pkg/specgenutil')
| -rw-r--r-- | pkg/specgenutil/volumes.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 2bd79b186..dd7eed2fd 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -28,7 +28,7 @@ var ( // TODO: handle options parsing/processing via containers/storage/pkg/mount func parseVolumes(volumeFlag, mountFlag, tmpfsFlag []string, addReadOnlyTmpfs bool) ([]spec.Mount, []*specgen.NamedVolume, []*specgen.OverlayVolume, []*specgen.ImageVolume, error) { // Get mounts from the --mounts flag. - unifiedMounts, unifiedVolumes, unifiedImageVolumes, err := getMounts(mountFlag) + unifiedMounts, unifiedVolumes, unifiedImageVolumes, err := Mounts(mountFlag) if err != nil { return nil, nil, nil, nil, err } @@ -167,12 +167,12 @@ func findMountType(input string) (mountType string, tokens []string, err error) return } -// getMounts takes user-provided input from the --mount flag and creates OCI +// Mounts takes user-provided input from the --mount flag and creates OCI // spec mounts and Libpod named volumes. // podman run --mount type=bind,src=/etc/resolv.conf,target=/etc/resolv.conf ... // podman run --mount type=tmpfs,target=/dev/shm ... // podman run --mount type=volume,source=test-volume, ... -func getMounts(mountFlag []string) (map[string]spec.Mount, map[string]*specgen.NamedVolume, map[string]*specgen.ImageVolume, error) { +func Mounts(mountFlag []string) (map[string]spec.Mount, map[string]*specgen.NamedVolume, map[string]*specgen.ImageVolume, error) { finalMounts := make(map[string]spec.Mount) finalNamedVolumes := make(map[string]*specgen.NamedVolume) finalImageVolumes := make(map[string]*specgen.ImageVolume) |