kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #22603 from runcom/fix-docker-build

Browse source 
pkg: chrootarchive: chroot_linux: fix docker build
This commit is contained in:
Sebastiaan van Stijn 2016-05-10 10:23:18 +02:00
commit 2f7c84120d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/chrootarchive/chroot_linux.go
View file

@ -43,7 +43,9 @@ func chroot(path string) (err error) {
} }
errCleanup := os.Remove(pivotDir) errCleanup := os.Remove(pivotDir)
if errCleanup != nil { // pivotDir doesn't exist if pivot_root failed and chroot+chdir was successful
// but we already cleaned it up on failed pivot_root
if errCleanup != nil && !os.IsNotExist(errCleanup) {
errCleanup = fmt.Errorf("Error cleaning up after pivot: %v", errCleanup) errCleanup = fmt.Errorf("Error cleaning up after pivot: %v", errCleanup)
if err == nil { if err == nil {
err = errCleanup err = errCleanup
@ -52,7 +54,10 @@ func chroot(path string) (err error) {
}() }()
if err := syscall.PivotRoot(path, pivotDir); err != nil { if err := syscall.PivotRoot(path, pivotDir); err != nil {
// If pivot fails, fall back to the normal chroot // If pivot fails, fall back to the normal chroot after cleaning up temp dir for pivot_root
if err := os.Remove(pivotDir); err != nil {
return fmt.Errorf("Error cleaning up after failed pivot: %v", err)
}
return realChroot(path) return realChroot(path)
} }
mounted = true mounted = true
@ -84,7 +89,7 @@ func realChroot(path string) error {
return fmt.Errorf("Error after fallback to chroot: %v", err) return fmt.Errorf("Error after fallback to chroot: %v", err)
} }
if err := syscall.Chdir("/"); err != nil { if err := syscall.Chdir("/"); err != nil {
return fmt.Errorf("Error chaning to new root after chroot: %v", err) return fmt.Errorf("Error changing to new root after chroot: %v", err)
} }
return nil return nil
} }