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

Update vendor of buildah to latest code

Browse Source 
Fix podman build man pages to match buildah functionality.

Also document .dockerignore formatted files.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-08-25 08:12:18 -04:00
parent 8fdc116954
commit 52b14a2218
24 changed files with 319 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vendor/github.com/containers/buildah/run_linux.go generated vendored
View File

@@ -192,7 +192,10 @@ func (b *Builder) Run(command []string, options RunOptions) error {
if err != nil {
return err
}
bindFiles["/etc/hosts"] = hostFile
// Only bind /etc/hosts if there's a network
if options.ConfigureNetwork != NetworkDisabled {
bindFiles["/etc/hosts"] = hostFile
}
}
if !(contains(volumes, "/etc/resolv.conf") || (len(b.CommonBuildOpts.DNSServers) == 1 && strings.ToLower(b.CommonBuildOpts.DNSServers[0]) == "none")) {
@@ -200,7 +203,10 @@ func (b *Builder) Run(command []string, options RunOptions) error {
if err != nil {
return err
}
bindFiles["/etc/resolv.conf"] = resolvFile
// Only bind /etc/resolv.conf if there's a network
if options.ConfigureNetwork != NetworkDisabled {
bindFiles["/etc/resolv.conf"] = resolvFile
}
}
// Empty file, so no need to recreate if it exists
if _, ok := bindFiles["/run/.containerenv"]; !ok {
@@ -1453,9 +1459,10 @@ func runUsingRuntimeMain() {
if err := setChildProcess(); err != nil {
os.Exit(1)
}
var ospec *specs.Spec
if options.Spec != nil {
ospec = options.Spec
ospec := options.Spec
if ospec == nil {
fmt.Fprintf(os.Stderr, "options spec not specified\n")
os.Exit(1)
}
// Run the container, start to finish.