mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 10:00:01 +08:00 
			
		
		
		
	vendor c/common
Also update the e2e pull test to account for the changes when pulling from the dir transport. Images pulled via the dir transport are not tagged anymore; the path is not a reliable source. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
		
							
								
								
									
										4
									
								
								vendor/github.com/containers/common/pkg/config/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/containers/common/pkg/config/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -11,6 +11,7 @@ import ( | ||||
|  | ||||
| 	"github.com/containers/common/pkg/apparmor" | ||||
| 	"github.com/containers/common/pkg/cgroupv2" | ||||
| 	"github.com/containers/common/pkg/util" | ||||
| 	"github.com/containers/storage/pkg/homedir" | ||||
| 	"github.com/containers/storage/pkg/unshare" | ||||
| 	"github.com/containers/storage/types" | ||||
| @ -202,7 +203,6 @@ func DefaultConfig() (*Config, error) { | ||||
| 			UserNSSize:         DefaultUserNSSize, | ||||
| 		}, | ||||
| 		Network: NetworkConfig{ | ||||
| 			NetworkBackend:   "cni", | ||||
| 			DefaultNetwork:   "podman", | ||||
| 			DefaultSubnet:    DefaultSubnet, | ||||
| 			NetworkConfigDir: cniConfig, | ||||
| @ -371,7 +371,7 @@ func defaultTmpDir() (string, error) { | ||||
| 		return "/run/libpod", nil | ||||
| 	} | ||||
|  | ||||
| 	runtimeDir, err := getRuntimeDir() | ||||
| 	runtimeDir, err := util.GetRuntimeDir() | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Valentin Rothberg
					Valentin Rothberg