mirror of
https://github.com/containers/podman.git
synced 2025-11-30 01:58:46 +08:00
vendor latest c/{buildah,common,image,storage}
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
7
vendor/github.com/containers/buildah/run_freebsd.go
generated
vendored
7
vendor/github.com/containers/buildah/run_freebsd.go
generated
vendored
@@ -124,10 +124,16 @@ func (b *Builder) Run(command []string, options RunOptions) error {
|
||||
return err
|
||||
}
|
||||
|
||||
workDir := b.WorkDir()
|
||||
if options.WorkingDir != "" {
|
||||
g.SetProcessCwd(options.WorkingDir)
|
||||
workDir = options.WorkingDir
|
||||
} else if b.WorkDir() != "" {
|
||||
g.SetProcessCwd(b.WorkDir())
|
||||
workDir = b.WorkDir()
|
||||
}
|
||||
if workDir == "" {
|
||||
workDir = string(os.PathSeparator)
|
||||
}
|
||||
mountPoint, err := b.Mount(b.MountLabel)
|
||||
if err != nil {
|
||||
@@ -249,6 +255,7 @@ func (b *Builder) Run(command []string, options RunOptions) error {
|
||||
}
|
||||
|
||||
runMountInfo := runMountInfo{
|
||||
WorkDir: workDir,
|
||||
ContextDir: options.ContextDir,
|
||||
Secrets: options.Secrets,
|
||||
SSHSources: options.SSHSources,
|
||||
|
||||
Reference in New Issue
Block a user