mirror of
https://github.com/containers/podman.git
synced 2025-09-28 09:15:26 +08:00
Bump to Buildah v1.13.1
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
10
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
10
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
@ -102,7 +102,7 @@ func CommonBuildOptions(c *cobra.Command) (*buildah.CommonBuildOptions, error) {
|
||||
if _, err := units.FromHumanSize(c.Flag("shm-size").Value.String()); err != nil {
|
||||
return nil, errors.Wrapf(err, "invalid --shm-size")
|
||||
}
|
||||
volumes, _ := c.Flags().GetStringSlice("volume")
|
||||
volumes, _ := c.Flags().GetStringArray("volume")
|
||||
if err := Volumes(volumes); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -589,6 +589,7 @@ func SystemContextFromOptions(c *cobra.Command) (*types.SystemContext, error) {
|
||||
if arch, err := c.Flags().GetString("override-arch"); err == nil {
|
||||
ctx.ArchitectureChoice = arch
|
||||
}
|
||||
ctx.BigFilesTemporaryDir = GetTempDir()
|
||||
return ctx, nil
|
||||
}
|
||||
|
||||
@ -956,3 +957,10 @@ func isValidDeviceMode(mode string) bool {
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func GetTempDir() string {
|
||||
if tmpdir, ok := os.LookupEnv("TMPDIR"); ok {
|
||||
return tmpdir
|
||||
}
|
||||
return "/var/tmp"
|
||||
}
|
||||
|
Reference in New Issue
Block a user