mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 18:08:51 +08:00 
			
		
		
		
	Update to runc main, removing pin to an older version
We were pinned to a specific commit to ensure that tests kept passing. Hopefully they pass now, as we need to grab latest runc for CVE fixes. Also grab Buildah main to fix a build issue on FreeBSD. After a botched manual vendor, I used Ed's treadmill script and squashed it into this commit to make Git happy. Thanks bunches Ed. Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
		
							
								
								
									
										19
									
								
								vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										19
									
								
								vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -132,16 +132,19 @@ func WithProcfd(root, unsafePath string, fn func(procfd string) error) error { | ||||
| 	return fn(procfd) | ||||
| } | ||||
|  | ||||
| // SearchLabels searches through a list of key=value pairs for a given key, | ||||
| // returning its value, and the binary flag telling whether the key exist. | ||||
| func SearchLabels(labels []string, key string) (string, bool) { | ||||
| 	key += "=" | ||||
| 	for _, s := range labels { | ||||
| 		if strings.HasPrefix(s, key) { | ||||
| 			return s[len(key):], true | ||||
| // SearchLabels searches a list of key-value pairs for the provided key and | ||||
| // returns the corresponding value. The pairs must be separated with '='. | ||||
| func SearchLabels(labels []string, query string) string { | ||||
| 	for _, l := range labels { | ||||
| 		parts := strings.SplitN(l, "=", 2) | ||||
| 		if len(parts) < 2 { | ||||
| 			continue | ||||
| 		} | ||||
| 		if parts[0] == query { | ||||
| 			return parts[1] | ||||
| 		} | ||||
| 	} | ||||
| 	return "", false | ||||
| 	return "" | ||||
| } | ||||
|  | ||||
| // Annotations returns the bundle path and user defined annotations from the | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Matt Heon
					Matt Heon