mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	prevent a panic with docker run -v /
This commit is contained in:
		
							parent
							
								
									553b4dae45
								
							
						
					
					
						commit
						536da93380
					
				
					 3 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -1814,6 +1814,8 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co
 | 
			
		|||
			flVolumes.Set(dstDir)
 | 
			
		||||
			binds = append(binds, bind)
 | 
			
		||||
			flVolumes.Delete(bind)
 | 
			
		||||
		} else if bind == "/" {
 | 
			
		||||
			return nil, nil, cmd, fmt.Errorf("Invalid volume: path can't be '/'")
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -128,7 +128,9 @@ func TestParseRunVolumes(t *testing.T) {
 | 
			
		|||
		t.Fatalf("Error parsing volume flags, without volume, no volume should be present. Received %v", config.Volumes)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	mustParse(t, "-v /")
 | 
			
		||||
	if _, _, err := parse(t, "-v /"); err == nil {
 | 
			
		||||
		t.Fatalf("Expected error, but got none")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if _, _, err := parse(t, "-v /:/"); err == nil {
 | 
			
		||||
		t.Fatalf("Error parsing volume flags, `-v /:/` should fail but didn't")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -836,7 +836,7 @@ func (container *Container) createVolumes() error {
 | 
			
		|||
		volPath = path.Join(container.RootfsPath(), volPath)
 | 
			
		||||
		rootVolPath, err := utils.FollowSymlinkInScope(volPath, container.RootfsPath())
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			panic(err)
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if _, err := os.Stat(rootVolPath); err != nil {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue