diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-19 09:00:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 09:00:35 -0400 |
| commit | 03f53efb51099c99bdc8bdf9975c43fe2c785d3a (patch) | |
| tree | b340ddc09d29ae2cf29cb83269bcb614d94a6a10 /cmd/podman/build.go | |
| parent | c3a0874222784e8996dbc472b9ca893a80aff451 (diff) | |
| parent | 92b28a88d8bcd5aa50352ecaff844229df1cee59 (diff) | |
| download | podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.tar.gz podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.tar.bz2 podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.zip | |
Merge pull request #1503 from rhatdan/buildah
Vendor in latest containers/buildah
Diffstat (limited to 'cmd/podman/build.go')
| -rw-r--r-- | cmd/podman/build.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 0ca0b3d83..1b8a5faec 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -1,13 +1,13 @@ package main import ( + "github.com/containers/buildah" + "github.com/containers/buildah/imagebuildah" + buildahcli "github.com/containers/buildah/pkg/cli" + "github.com/containers/buildah/pkg/parse" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" - "github.com/projectatomic/buildah" - "github.com/projectatomic/buildah/imagebuildah" - buildahcli "github.com/projectatomic/buildah/pkg/cli" - "github.com/projectatomic/buildah/pkg/parse" "github.com/sirupsen/logrus" "github.com/urfave/cli" "io/ioutil" @@ -50,7 +50,7 @@ func getDockerfiles(files []string) []string { } func buildCmd(c *cli.Context) error { - // The following was taken directly from projectatomic/buildah/cmd/bud.go + // The following was taken directly from containers/buildah/cmd/bud.go // TODO Find a away to vendor more of this in rather than copy from bud output := "" |