mirror of
https://github.com/containers/podman.git
synced 2025-12-15 11:42:28 +08:00
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
13
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
13
vendor/github.com/containers/buildah/imagebuildah/build.go
generated
vendored
@@ -165,11 +165,22 @@ func BuildDockerfiles(ctx context.Context, store storage.Store, options define.B
|
||||
}
|
||||
|
||||
func warnOnUnsetBuildArgs(node *parser.Node, args map[string]string) {
|
||||
argFound := make(map[string]bool)
|
||||
for _, child := range node.Children {
|
||||
switch strings.ToUpper(child.Value) {
|
||||
case "ARG":
|
||||
argName := child.Next.Value
|
||||
if _, ok := args[argName]; !strings.Contains(argName, "=") && !ok {
|
||||
if strings.Contains(argName, "=") {
|
||||
res := strings.Split(argName, "=")
|
||||
if res[1] != "" {
|
||||
argFound[res[0]] = true
|
||||
}
|
||||
}
|
||||
argHasValue := true
|
||||
if !strings.Contains(argName, "=") {
|
||||
argHasValue = argFound[argName]
|
||||
}
|
||||
if _, ok := args[argName]; !argHasValue && !ok {
|
||||
logrus.Warnf("missing %q build argument. Try adding %q to the command line", argName, fmt.Sprintf("--build-arg %s=<VALUE>", argName))
|
||||
}
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user