diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-05-15 17:29:09 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-16 14:39:55 +0000 |
| commit | 9fcc475d033d7f1718e9490e8944de7f31a2bbab (patch) | |
| tree | ee2c2c93392a188b4392ab64649b929d1e60f027 /vendor/github.com/projectatomic/buildah/run.go | |
| parent | 1aaf8df5be32d755a3f72f9259c66c70fbf850d8 (diff) | |
| download | podman-9fcc475d033d7f1718e9490e8944de7f31a2bbab.tar.gz podman-9fcc475d033d7f1718e9490e8944de7f31a2bbab.tar.bz2 podman-9fcc475d033d7f1718e9490e8944de7f31a2bbab.zip | |
Support pulling Dockerfile from http
Currently podman build http://remote.com/Dockerfile does not work.
podman always treats this file as an Archive.
Vendoring in the latest buildah code fixes this issue. Also updated
the man pages to better explain the syntax.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #775
Approved by: TomSweeneyRedHat
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/run.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/run.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/projectatomic/buildah/run.go index b45a0e3a6..50edc9434 100644 --- a/vendor/github.com/projectatomic/buildah/run.go +++ b/vendor/github.com/projectatomic/buildah/run.go @@ -326,15 +326,7 @@ func (b *Builder) Run(command []string, options RunOptions) error { if len(command) > 0 { g.SetProcessArgs(command) } else { - cmd := b.Cmd() - if len(options.Cmd) > 0 { - cmd = options.Cmd - } - entrypoint := b.Entrypoint() - if len(options.Entrypoint) > 0 { - entrypoint = options.Entrypoint - } - g.SetProcessArgs(append(entrypoint, cmd...)) + g.SetProcessArgs(nil) } if options.WorkingDir != "" { g.SetProcessCwd(options.WorkingDir) |