diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-08-14 12:06:09 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-15 11:40:30 +0000 |
| commit | e2b96e96f93d1da17b817eaa960b9d809bc61a14 (patch) | |
| tree | 9dbf734f5f2021889666da7a738792635f2bf520 /vendor/github.com/projectatomic/buildah/imagebuildah | |
| parent | cd7102a70e7f3555df832c4c1bcf958e121cbf4d (diff) | |
| download | podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.gz podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.bz2 podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.zip | |
vendor: update buildah version
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #1269
Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/imagebuildah')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/imagebuildah/build.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index 42e51878e..c7182e15e 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -1203,8 +1203,9 @@ func BuildDockerfiles(ctx context.Context, store storage.Store, options BuildOpt } data = resp.Body } else { - if !filepath.IsAbs(dfile) { - logrus.Debugf("resolving local Dockerfile %q", dfile) + // If the Dockerfile isn't found try prepending the + // context directory to it. + if _, err := os.Stat(dfile); os.IsNotExist(err) { dfile = filepath.Join(options.ContextDirectory, dfile) } logrus.Debugf("reading local Dockerfile %q", dfile) |