summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-04 10:45:10 -0800
committerGitHub <noreply@github.com>2020-02-04 10:45:10 -0800
commitb702134edc823782e67fd3f06fdeaf3f63de2af3 (patch)
tree7ff08c3bbca2efacc1cb66531b61838e4d9e0054
parent537352cc3ee60373b41481a7f48e65b1978ea5f7 (diff)
parent59328a22dbb2fd4bc5a02e08b7845e1044e56693 (diff)
downloadpodman-b702134edc823782e67fd3f06fdeaf3f63de2af3.tar.gz
podman-b702134edc823782e67fd3f06fdeaf3f63de2af3.tar.bz2
podman-b702134edc823782e67fd3f06fdeaf3f63de2af3.zip
Merge pull request #5080 from openSUSE/containerfile-context-fix
Fix wrong Containerfile location on build
-rw-r--r--cmd/podman/build.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 885f2ac51..1fcb98a0e 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -234,10 +234,6 @@ func buildCmd(c *cliconfig.BuildValues) error {
return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
}
contextDir = filepath.Dir(absFile)
- containerfiles[i], err = filepath.Rel(contextDir, absFile)
- if err != nil {
- return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
- }
break
}
}