mirror of
https://github.com/containers/podman.git
synced 2025-11-29 09:37:38 +08:00
Switch common, storage and image to monorepo.
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
14
vendor/github.com/openshift/imagebuilder/evaluator.go
generated
vendored
14
vendor/github.com/openshift/imagebuilder/evaluator.go
generated
vendored
@@ -5,9 +5,9 @@ import (
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser"
|
||||
"github.com/openshift/imagebuilder/dockerfile/command"
|
||||
"github.com/openshift/imagebuilder/dockerfile/parser"
|
||||
buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser"
|
||||
)
|
||||
|
||||
// ParseDockerfile parses the provided stream as a canonical Dockerfile
|
||||
@@ -35,10 +35,14 @@ var replaceEnvAllowed = map[string]bool{
|
||||
|
||||
// Certain commands are allowed to have their args split into more
|
||||
// words after env var replacements. Meaning:
|
||||
// ENV foo="123 456"
|
||||
// EXPOSE $foo
|
||||
//
|
||||
// ENV foo="123 456"
|
||||
// EXPOSE $foo
|
||||
//
|
||||
// should result in the same thing as:
|
||||
// EXPOSE 123 456
|
||||
//
|
||||
// EXPOSE 123 456
|
||||
//
|
||||
// and not treat "123 456" as a single word.
|
||||
// Note that: EXPOSE "$foo" and EXPOSE $foo are not the same thing.
|
||||
// Quotes will cause it to still be treated as single word.
|
||||
@@ -56,7 +60,7 @@ type Step struct {
|
||||
Flags []string
|
||||
Attrs map[string]bool
|
||||
Message string
|
||||
Heredocs []buildkitparser.Heredoc
|
||||
Heredocs []buildkitparser.Heredoc
|
||||
Original string
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user