summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/build.go10
-rw-r--r--cmd/podman/commit.go2
-rw-r--r--cmd/podman/common.go2
3 files changed, 7 insertions, 7 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 := ""
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 517eefd07..234926de0 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -6,13 +6,13 @@ import (
"os"
"strings"
+ "github.com/containers/buildah"
"github.com/containers/image/manifest"
"github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/image"
"github.com/containers/libpod/pkg/util"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
"github.com/urfave/cli"
)
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 578de7f38..8d20081f6 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -8,11 +8,11 @@ import (
"regexp"
"strings"
+ "github.com/containers/buildah"
"github.com/containers/libpod/libpod"
"github.com/containers/storage"
"github.com/fatih/camelcase"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
"github.com/urfave/cli"
)