opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-15 11:42:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

short-name aliasing

Browse Source 
Add support for short-name aliasing.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2020-10-07 16:58:53 +02:00
parent 0b1a60ec27
commit 8e4a42aa42
128 changed files with 12694 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vendor/github.com/containers/buildah/imagebuildah/build.go generated vendored
View File

@@ -216,20 +216,19 @@ func BuildDockerfiles(ctx context.Context, store storage.Store, options BuildOpt
}
data = resp.Body
} else {
// If the Dockerfile isn't found try prepending the
// context directory to it.
dinfo, err := os.Stat(dfile)
if os.IsNotExist(err) {
// If they are "/workDir/Dockerfile" and "/workDir"
// so don't joint it
if err != nil {
// If the Dockerfile isn't available, try again with
// context directory prepended (if not prepended yet).
if !strings.HasPrefix(dfile, options.ContextDirectory) {
dfile = filepath.Join(options.ContextDirectory, dfile)
}
dinfo, err = os.Stat(dfile)
if err != nil {
return "", nil, err
dinfo, err = os.Stat(dfile)
}
}
if err != nil {
return "", nil, err
}
// If given a directory, add '/Dockerfile' to it.
if dinfo.Mode().IsDir() {
dfile = filepath.Join(dfile, "Dockerfile")