summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/buildah/LICENSE (renamed from vendor/github.com/projectatomic/buildah/LICENSE)0
-rw-r--r--vendor/github.com/containers/buildah/README.md (renamed from vendor/github.com/projectatomic/buildah/README.md)10
-rw-r--r--vendor/github.com/containers/buildah/add.go (renamed from vendor/github.com/projectatomic/buildah/add.go)2
-rw-r--r--vendor/github.com/containers/buildah/bind/mount.go (renamed from vendor/github.com/projectatomic/buildah/bind/mount.go)2
-rw-r--r--vendor/github.com/containers/buildah/bind/mount_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/bind/mount_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/bind/util.go (renamed from vendor/github.com/projectatomic/buildah/bind/util.go)2
-rw-r--r--vendor/github.com/containers/buildah/buildah.go (renamed from vendor/github.com/projectatomic/buildah/buildah.go)4
-rw-r--r--vendor/github.com/containers/buildah/chroot/run.go (renamed from vendor/github.com/projectatomic/buildah/chroot/run.go)6
-rw-r--r--vendor/github.com/containers/buildah/chroot/seccomp.go (renamed from vendor/github.com/projectatomic/buildah/chroot/seccomp.go)0
-rw-r--r--vendor/github.com/containers/buildah/chroot/seccomp_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/chroot/seccomp_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/chroot/selinux.go (renamed from vendor/github.com/projectatomic/buildah/chroot/selinux.go)0
-rw-r--r--vendor/github.com/containers/buildah/chroot/selinux_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/chroot/selinux_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/chroot/unsupported.go (renamed from vendor/github.com/projectatomic/buildah/chroot/unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/chroot/util.go (renamed from vendor/github.com/projectatomic/buildah/chroot/util.go)0
-rw-r--r--vendor/github.com/containers/buildah/commit.go (renamed from vendor/github.com/projectatomic/buildah/commit.go)2
-rw-r--r--vendor/github.com/containers/buildah/common.go (renamed from vendor/github.com/projectatomic/buildah/common.go)0
-rw-r--r--vendor/github.com/containers/buildah/config.go (renamed from vendor/github.com/projectatomic/buildah/config.go)2
-rw-r--r--vendor/github.com/containers/buildah/delete.go (renamed from vendor/github.com/projectatomic/buildah/delete.go)0
-rw-r--r--vendor/github.com/containers/buildah/docker/types.go (renamed from vendor/github.com/projectatomic/buildah/docker/types.go)0
-rw-r--r--vendor/github.com/containers/buildah/image.go (renamed from vendor/github.com/projectatomic/buildah/image.go)2
-rw-r--r--vendor/github.com/containers/buildah/imagebuildah/build.go (renamed from vendor/github.com/projectatomic/buildah/imagebuildah/build.go)4
-rw-r--r--vendor/github.com/containers/buildah/imagebuildah/chroot_symlink.go (renamed from vendor/github.com/projectatomic/buildah/imagebuildah/chroot_symlink.go)0
-rw-r--r--vendor/github.com/containers/buildah/imagebuildah/util.go (renamed from vendor/github.com/projectatomic/buildah/imagebuildah/util.go)2
-rw-r--r--vendor/github.com/containers/buildah/import.go (renamed from vendor/github.com/projectatomic/buildah/import.go)4
-rw-r--r--vendor/github.com/containers/buildah/mount.go (renamed from vendor/github.com/projectatomic/buildah/mount.go)0
-rw-r--r--vendor/github.com/containers/buildah/new.go (renamed from vendor/github.com/projectatomic/buildah/new.go)2
-rw-r--r--vendor/github.com/containers/buildah/pkg/cli/common.go (renamed from vendor/github.com/projectatomic/buildah/pkg/cli/common.go)4
-rw-r--r--vendor/github.com/containers/buildah/pkg/parse/parse.go (renamed from vendor/github.com/projectatomic/buildah/pkg/parse/parse.go)2
-rw-r--r--vendor/github.com/containers/buildah/pull.go (renamed from vendor/github.com/projectatomic/buildah/pull.go)2
-rw-r--r--vendor/github.com/containers/buildah/run.go (renamed from vendor/github.com/projectatomic/buildah/run.go)6
-rw-r--r--vendor/github.com/containers/buildah/run_linux.go (renamed from vendor/github.com/projectatomic/buildah/run_linux.go)0
-rw-r--r--vendor/github.com/containers/buildah/run_unsupport.go (renamed from vendor/github.com/projectatomic/buildah/run_unsupport.go)0
-rw-r--r--vendor/github.com/containers/buildah/seccomp.go (renamed from vendor/github.com/projectatomic/buildah/seccomp.go)0
-rw-r--r--vendor/github.com/containers/buildah/seccomp_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/seccomp_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/selinux.go (renamed from vendor/github.com/projectatomic/buildah/selinux.go)0
-rw-r--r--vendor/github.com/containers/buildah/selinux_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/selinux_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/unmount.go (renamed from vendor/github.com/projectatomic/buildah/unmount.go)0
-rw-r--r--vendor/github.com/containers/buildah/unshare/unshare.c (renamed from vendor/github.com/projectatomic/buildah/unshare/unshare.c)0
-rw-r--r--vendor/github.com/containers/buildah/unshare/unshare.go (renamed from vendor/github.com/projectatomic/buildah/unshare/unshare.go)2
-rw-r--r--vendor/github.com/containers/buildah/unshare/unshare_cgo.go (renamed from vendor/github.com/projectatomic/buildah/unshare/unshare_cgo.go)0
-rw-r--r--vendor/github.com/containers/buildah/unshare/unshare_gccgo.go (renamed from vendor/github.com/projectatomic/buildah/unshare/unshare_gccgo.go)0
-rw-r--r--vendor/github.com/containers/buildah/unshare/unshare_unsupported.go (renamed from vendor/github.com/projectatomic/buildah/unshare/unshare_unsupported.go)0
-rw-r--r--vendor/github.com/containers/buildah/util.go (renamed from vendor/github.com/projectatomic/buildah/util.go)0
-rw-r--r--vendor/github.com/containers/buildah/util/types.go (renamed from vendor/github.com/projectatomic/buildah/util/types.go)0
-rw-r--r--vendor/github.com/containers/buildah/util/util.go (renamed from vendor/github.com/projectatomic/buildah/util/util.go)0
-rw-r--r--vendor/github.com/containers/buildah/vendor.conf (renamed from vendor/github.com/projectatomic/buildah/vendor.conf)0
46 files changed, 30 insertions, 30 deletions
diff --git a/vendor/github.com/projectatomic/buildah/LICENSE b/vendor/github.com/containers/buildah/LICENSE
index 8dada3eda..8dada3eda 100644
--- a/vendor/github.com/projectatomic/buildah/LICENSE
+++ b/vendor/github.com/containers/buildah/LICENSE
diff --git a/vendor/github.com/projectatomic/buildah/README.md b/vendor/github.com/containers/buildah/README.md
index 0d3d19ee3..b04957591 100644
--- a/vendor/github.com/projectatomic/buildah/README.md
+++ b/vendor/github.com/containers/buildah/README.md
@@ -1,9 +1,9 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
# [Buildah](https://www.youtube.com/embed/YVk5NgSiUw8) - a tool that facilitates building [Open Container Initiative (OCI)](https://www.opencontainers.org/) container images
-[![Go Report Card](https://goreportcard.com/badge/github.com/projectatomic/buildah)](https://goreportcard.com/report/github.com/projectatomic/buildah)
-[![Travis](https://travis-ci.org/projectatomic/buildah.svg?branch=master)](https://travis-ci.org/projectatomic/buildah)
+[![Go Report Card](https://goreportcard.com/badge/github.com/containers/buildah)](https://goreportcard.com/report/github.com/containers/buildah)
+[![Travis](https://travis-ci.org/containers/buildah.svg?branch=master)](https://travis-ci.org/containers/buildah)
The Buildah package provides a command line tool that can be used to
* create a working container, either from scratch or using an image as a starting point
@@ -35,7 +35,7 @@ The Buildah package provides a command line tool that can be used to
Buildah and Podman are two complementary Open-source projects that are available on
most Linux platforms and both projects reside at [GitHub.com](https://github.com)
-with Buildah [here](https://github.com/projectatomic/buildah) and
+with Buildah [here](https://github.com/containers/buildah) and
Podman [here](https://github.com/containers/libpod). Both Buildah and Podman are
command line tools that work on OCI images and containers. The two projects
differentiate in their specialization.
@@ -61,7 +61,7 @@ storage differences, you can not see Podman containers from within Buildah or vi
In short Buildah is an efficient way to create OCI images while Podman allows
you to manage and maintain those images and containers in a production environment using
familiar container cli commands. For more details, see the
-[Container Tools Guide](https://github.com/projectatomic/buildah/tree/master/docs/containertools).
+[Container Tools Guide](https://github.com/containers/buildah/tree/master/docs/containertools).
## Example
diff --git a/vendor/github.com/projectatomic/buildah/add.go b/vendor/github.com/containers/buildah/add.go
index 27c07c323..b1747db94 100644
--- a/vendor/github.com/projectatomic/buildah/add.go
+++ b/vendor/github.com/containers/buildah/add.go
@@ -11,12 +11,12 @@ import (
"syscall"
"time"
+ "github.com/containers/buildah/util"
"github.com/containers/libpod/pkg/chrootuser"
"github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/idtools"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/bind/mount.go b/vendor/github.com/containers/buildah/bind/mount.go
index 695bde554..e1ae323b9 100644
--- a/vendor/github.com/projectatomic/buildah/bind/mount.go
+++ b/vendor/github.com/containers/buildah/bind/mount.go
@@ -8,11 +8,11 @@ import (
"path/filepath"
"syscall"
+ "github.com/containers/buildah/util"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/mount"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/projectatomic/buildah/bind/mount_unsupported.go b/vendor/github.com/containers/buildah/bind/mount_unsupported.go
index 88ca2ca8b..88ca2ca8b 100644
--- a/vendor/github.com/projectatomic/buildah/bind/mount_unsupported.go
+++ b/vendor/github.com/containers/buildah/bind/mount_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/bind/util.go b/vendor/github.com/containers/buildah/bind/util.go
index 4408c53bb..93ba4e2b7 100644
--- a/vendor/github.com/projectatomic/buildah/bind/util.go
+++ b/vendor/github.com/containers/buildah/bind/util.go
@@ -1,8 +1,8 @@
package bind
import (
+ "github.com/containers/buildah/util"
"github.com/opencontainers/runtime-spec/specs-go"
- "github.com/projectatomic/buildah/util"
)
const (
diff --git a/vendor/github.com/projectatomic/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
index 60688b372..7891810a2 100644
--- a/vendor/github.com/projectatomic/buildah/buildah.go
+++ b/vendor/github.com/containers/buildah/buildah.go
@@ -9,13 +9,13 @@ import (
"os"
"path/filepath"
+ "github.com/containers/buildah/docker"
+ "github.com/containers/buildah/util"
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/containers/storage/pkg/ioutils"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/docker"
- "github.com/projectatomic/buildah/util"
)
const (
diff --git a/vendor/github.com/projectatomic/buildah/chroot/run.go b/vendor/github.com/containers/buildah/chroot/run.go
index c8aec181a..58b7a883c 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/run.go
+++ b/vendor/github.com/containers/buildah/chroot/run.go
@@ -17,15 +17,15 @@ import (
"syscall"
"unsafe"
+ "github.com/containers/buildah/bind"
+ "github.com/containers/buildah/unshare"
+ "github.com/containers/buildah/util"
"github.com/containers/storage/pkg/ioutils"
"github.com/containers/storage/pkg/mount"
"github.com/containers/storage/pkg/reexec"
"github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/bind"
- "github.com/projectatomic/buildah/unshare"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
"github.com/syndtr/gocapability/capability"
"golang.org/x/crypto/ssh/terminal"
diff --git a/vendor/github.com/projectatomic/buildah/chroot/seccomp.go b/vendor/github.com/containers/buildah/chroot/seccomp.go
index f2c55017f..f2c55017f 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/seccomp.go
+++ b/vendor/github.com/containers/buildah/chroot/seccomp.go
diff --git a/vendor/github.com/projectatomic/buildah/chroot/seccomp_unsupported.go b/vendor/github.com/containers/buildah/chroot/seccomp_unsupported.go
index a5b74bf09..a5b74bf09 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/seccomp_unsupported.go
+++ b/vendor/github.com/containers/buildah/chroot/seccomp_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/chroot/selinux.go b/vendor/github.com/containers/buildah/chroot/selinux.go
index 3e62d743d..3e62d743d 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/selinux.go
+++ b/vendor/github.com/containers/buildah/chroot/selinux.go
diff --git a/vendor/github.com/projectatomic/buildah/chroot/selinux_unsupported.go b/vendor/github.com/containers/buildah/chroot/selinux_unsupported.go
index 1c6f48912..1c6f48912 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/selinux_unsupported.go
+++ b/vendor/github.com/containers/buildah/chroot/selinux_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/chroot/unsupported.go b/vendor/github.com/containers/buildah/chroot/unsupported.go
index 5312c0024..5312c0024 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/unsupported.go
+++ b/vendor/github.com/containers/buildah/chroot/unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/chroot/util.go b/vendor/github.com/containers/buildah/chroot/util.go
index 34cc77260..34cc77260 100644
--- a/vendor/github.com/projectatomic/buildah/chroot/util.go
+++ b/vendor/github.com/containers/buildah/chroot/util.go
diff --git a/vendor/github.com/projectatomic/buildah/commit.go b/vendor/github.com/containers/buildah/commit.go
index 2d49832a7..f89930399 100644
--- a/vendor/github.com/projectatomic/buildah/commit.go
+++ b/vendor/github.com/containers/buildah/commit.go
@@ -7,6 +7,7 @@ import (
"io/ioutil"
"time"
+ "github.com/containers/buildah/util"
cp "github.com/containers/image/copy"
"github.com/containers/image/signature"
is "github.com/containers/image/storage"
@@ -15,7 +16,6 @@ import (
"github.com/containers/storage"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/common.go b/vendor/github.com/containers/buildah/common.go
index dcf922dc9..dcf922dc9 100644
--- a/vendor/github.com/projectatomic/buildah/common.go
+++ b/vendor/github.com/containers/buildah/common.go
diff --git a/vendor/github.com/projectatomic/buildah/config.go b/vendor/github.com/containers/buildah/config.go
index 2f4d8319a..f6a742d59 100644
--- a/vendor/github.com/projectatomic/buildah/config.go
+++ b/vendor/github.com/containers/buildah/config.go
@@ -8,13 +8,13 @@ import (
"strings"
"time"
+ "github.com/containers/buildah/docker"
"github.com/containers/image/manifest"
"github.com/containers/image/transports"
"github.com/containers/image/types"
"github.com/containers/storage/pkg/stringid"
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/docker"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/delete.go b/vendor/github.com/containers/buildah/delete.go
index 8de774ff9..8de774ff9 100644
--- a/vendor/github.com/projectatomic/buildah/delete.go
+++ b/vendor/github.com/containers/buildah/delete.go
diff --git a/vendor/github.com/projectatomic/buildah/docker/types.go b/vendor/github.com/containers/buildah/docker/types.go
index 759fc1246..759fc1246 100644
--- a/vendor/github.com/projectatomic/buildah/docker/types.go
+++ b/vendor/github.com/containers/buildah/docker/types.go
diff --git a/vendor/github.com/projectatomic/buildah/image.go b/vendor/github.com/containers/buildah/image.go
index b94720f59..df50d95bd 100644
--- a/vendor/github.com/projectatomic/buildah/image.go
+++ b/vendor/github.com/containers/buildah/image.go
@@ -11,6 +11,7 @@ import (
"path/filepath"
"time"
+ "github.com/containers/buildah/docker"
"github.com/containers/image/docker/reference"
"github.com/containers/image/image"
"github.com/containers/image/manifest"
@@ -23,7 +24,6 @@ import (
specs "github.com/opencontainers/image-spec/specs-go"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/docker"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/containers/buildah/imagebuildah/build.go
index 08d0f6268..4bcd38c05 100644
--- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
+++ b/vendor/github.com/containers/buildah/imagebuildah/build.go
@@ -14,6 +14,8 @@ import (
"strings"
"time"
+ "github.com/containers/buildah"
+ "github.com/containers/buildah/util"
cp "github.com/containers/image/copy"
is "github.com/containers/image/storage"
"github.com/containers/image/transports"
@@ -28,8 +30,6 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/openshift/imagebuilder"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/chroot_symlink.go b/vendor/github.com/containers/buildah/imagebuildah/chroot_symlink.go
index f1fec7f70..f1fec7f70 100644
--- a/vendor/github.com/projectatomic/buildah/imagebuildah/chroot_symlink.go
+++ b/vendor/github.com/containers/buildah/imagebuildah/chroot_symlink.go
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/util.go b/vendor/github.com/containers/buildah/imagebuildah/util.go
index b437ea1cb..35dc5438a 100644
--- a/vendor/github.com/projectatomic/buildah/imagebuildah/util.go
+++ b/vendor/github.com/containers/buildah/imagebuildah/util.go
@@ -10,9 +10,9 @@ import (
"path/filepath"
"strings"
+ "github.com/containers/buildah"
"github.com/containers/storage/pkg/chrootarchive"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/import.go b/vendor/github.com/containers/buildah/import.go
index 31288334a..f5f156be2 100644
--- a/vendor/github.com/projectatomic/buildah/import.go
+++ b/vendor/github.com/containers/buildah/import.go
@@ -3,13 +3,13 @@ package buildah
import (
"context"
+ "github.com/containers/buildah/docker"
+ "github.com/containers/buildah/util"
is "github.com/containers/image/storage"
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/docker"
- "github.com/projectatomic/buildah/util"
)
func importBuilderDataFromImage(ctx context.Context, store storage.Store, systemContext *types.SystemContext, imageID, containerName, containerID string) (*Builder, error) {
diff --git a/vendor/github.com/projectatomic/buildah/mount.go b/vendor/github.com/containers/buildah/mount.go
index 4f1ae3c6e..4f1ae3c6e 100644
--- a/vendor/github.com/projectatomic/buildah/mount.go
+++ b/vendor/github.com/containers/buildah/mount.go
diff --git a/vendor/github.com/projectatomic/buildah/new.go b/vendor/github.com/containers/buildah/new.go
index 0eb8d8e42..b0b655da9 100644
--- a/vendor/github.com/projectatomic/buildah/new.go
+++ b/vendor/github.com/containers/buildah/new.go
@@ -6,6 +6,7 @@ import (
"os"
"strings"
+ "github.com/containers/buildah/util"
"github.com/containers/image/pkg/sysregistries"
is "github.com/containers/image/storage"
"github.com/containers/image/transports"
@@ -17,7 +18,6 @@ import (
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/openshift/imagebuilder"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/containers/buildah/pkg/cli/common.go
index a438daf6a..94b92e1eb 100644
--- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go
+++ b/vendor/github.com/containers/buildah/pkg/cli/common.go
@@ -9,10 +9,10 @@ import (
"os"
"strings"
+ "github.com/containers/buildah"
+ "github.com/containers/buildah/util"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
- "github.com/projectatomic/buildah/util"
"github.com/urfave/cli"
)
diff --git a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go b/vendor/github.com/containers/buildah/pkg/parse/parse.go
index 2dff18818..d206508b4 100644
--- a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go
+++ b/vendor/github.com/containers/buildah/pkg/parse/parse.go
@@ -15,12 +15,12 @@ import (
"strings"
"unicode"
+ "github.com/containers/buildah"
"github.com/containers/image/types"
"github.com/containers/storage/pkg/idtools"
"github.com/docker/go-units"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
diff --git a/vendor/github.com/projectatomic/buildah/pull.go b/vendor/github.com/containers/buildah/pull.go
index 1d2bb7f87..c2fc6637f 100644
--- a/vendor/github.com/projectatomic/buildah/pull.go
+++ b/vendor/github.com/containers/buildah/pull.go
@@ -5,6 +5,7 @@ import (
"io"
"strings"
+ "github.com/containers/buildah/util"
cp "github.com/containers/image/copy"
"github.com/containers/image/docker/reference"
tarfile "github.com/containers/image/docker/tarfile"
@@ -17,7 +18,6 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
)
diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/containers/buildah/run.go
index 2ce5add39..3d9b909ae 100644
--- a/vendor/github.com/projectatomic/buildah/run.go
+++ b/vendor/github.com/containers/buildah/run.go
@@ -19,6 +19,9 @@ import (
"time"
"github.com/containernetworking/cni/libcni"
+ "github.com/containers/buildah/bind"
+ "github.com/containers/buildah/chroot"
+ "github.com/containers/buildah/util"
"github.com/containers/libpod/pkg/secrets"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/ioutils"
@@ -29,9 +32,6 @@ import (
"github.com/opencontainers/runtime-tools/generate"
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/bind"
- "github.com/projectatomic/buildah/chroot"
- "github.com/projectatomic/buildah/util"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh/terminal"
"golang.org/x/sys/unix"
diff --git a/vendor/github.com/projectatomic/buildah/run_linux.go b/vendor/github.com/containers/buildah/run_linux.go
index a7519a092..a7519a092 100644
--- a/vendor/github.com/projectatomic/buildah/run_linux.go
+++ b/vendor/github.com/containers/buildah/run_linux.go
diff --git a/vendor/github.com/projectatomic/buildah/run_unsupport.go b/vendor/github.com/containers/buildah/run_unsupport.go
index 4824a0c4e..4824a0c4e 100644
--- a/vendor/github.com/projectatomic/buildah/run_unsupport.go
+++ b/vendor/github.com/containers/buildah/run_unsupport.go
diff --git a/vendor/github.com/projectatomic/buildah/seccomp.go b/vendor/github.com/containers/buildah/seccomp.go
index a435b5f71..a435b5f71 100644
--- a/vendor/github.com/projectatomic/buildah/seccomp.go
+++ b/vendor/github.com/containers/buildah/seccomp.go
diff --git a/vendor/github.com/projectatomic/buildah/seccomp_unsupported.go b/vendor/github.com/containers/buildah/seccomp_unsupported.go
index cba8390c5..cba8390c5 100644
--- a/vendor/github.com/projectatomic/buildah/seccomp_unsupported.go
+++ b/vendor/github.com/containers/buildah/seccomp_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/selinux.go b/vendor/github.com/containers/buildah/selinux.go
index 2b850cf9f..2b850cf9f 100644
--- a/vendor/github.com/projectatomic/buildah/selinux.go
+++ b/vendor/github.com/containers/buildah/selinux.go
diff --git a/vendor/github.com/projectatomic/buildah/selinux_unsupported.go b/vendor/github.com/containers/buildah/selinux_unsupported.go
index 0aa7c46e4..0aa7c46e4 100644
--- a/vendor/github.com/projectatomic/buildah/selinux_unsupported.go
+++ b/vendor/github.com/containers/buildah/selinux_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/unmount.go b/vendor/github.com/containers/buildah/unmount.go
index cdb511170..cdb511170 100644
--- a/vendor/github.com/projectatomic/buildah/unmount.go
+++ b/vendor/github.com/containers/buildah/unmount.go
diff --git a/vendor/github.com/projectatomic/buildah/unshare/unshare.c b/vendor/github.com/containers/buildah/unshare/unshare.c
index 83864359b..83864359b 100644
--- a/vendor/github.com/projectatomic/buildah/unshare/unshare.c
+++ b/vendor/github.com/containers/buildah/unshare/unshare.c
diff --git a/vendor/github.com/projectatomic/buildah/unshare/unshare.go b/vendor/github.com/containers/buildah/unshare/unshare.go
index 4eea74956..d89dfc053 100644
--- a/vendor/github.com/projectatomic/buildah/unshare/unshare.go
+++ b/vendor/github.com/containers/buildah/unshare/unshare.go
@@ -13,10 +13,10 @@ import (
"strings"
"syscall"
+ "github.com/containers/buildah/util"
"github.com/containers/storage/pkg/reexec"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
- "github.com/projectatomic/buildah/util"
)
// Cmd wraps an exec.Cmd created by the reexec package in unshare(), and
diff --git a/vendor/github.com/projectatomic/buildah/unshare/unshare_cgo.go b/vendor/github.com/containers/buildah/unshare/unshare_cgo.go
index 26a0b2c20..26a0b2c20 100644
--- a/vendor/github.com/projectatomic/buildah/unshare/unshare_cgo.go
+++ b/vendor/github.com/containers/buildah/unshare/unshare_cgo.go
diff --git a/vendor/github.com/projectatomic/buildah/unshare/unshare_gccgo.go b/vendor/github.com/containers/buildah/unshare/unshare_gccgo.go
index c4811782a..c4811782a 100644
--- a/vendor/github.com/projectatomic/buildah/unshare/unshare_gccgo.go
+++ b/vendor/github.com/containers/buildah/unshare/unshare_gccgo.go
diff --git a/vendor/github.com/projectatomic/buildah/unshare/unshare_unsupported.go b/vendor/github.com/containers/buildah/unshare/unshare_unsupported.go
index feeceae66..feeceae66 100644
--- a/vendor/github.com/projectatomic/buildah/unshare/unshare_unsupported.go
+++ b/vendor/github.com/containers/buildah/unshare/unshare_unsupported.go
diff --git a/vendor/github.com/projectatomic/buildah/util.go b/vendor/github.com/containers/buildah/util.go
index ef9be87fb..ef9be87fb 100644
--- a/vendor/github.com/projectatomic/buildah/util.go
+++ b/vendor/github.com/containers/buildah/util.go
diff --git a/vendor/github.com/projectatomic/buildah/util/types.go b/vendor/github.com/containers/buildah/util/types.go
index dc5f4b6c8..dc5f4b6c8 100644
--- a/vendor/github.com/projectatomic/buildah/util/types.go
+++ b/vendor/github.com/containers/buildah/util/types.go
diff --git a/vendor/github.com/projectatomic/buildah/util/util.go b/vendor/github.com/containers/buildah/util/util.go
index 93323232d..93323232d 100644
--- a/vendor/github.com/projectatomic/buildah/util/util.go
+++ b/vendor/github.com/containers/buildah/util/util.go
diff --git a/vendor/github.com/projectatomic/buildah/vendor.conf b/vendor/github.com/containers/buildah/vendor.conf
index 0112a2d91..0112a2d91 100644
--- a/vendor/github.com/projectatomic/buildah/vendor.conf
+++ b/vendor/github.com/containers/buildah/vendor.conf