Vendor in latest containers/buildah

Switch from projectatomic/buildah to containers/buildah

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

.github/ISSUE_TEMPLATE.md

@@ -13,7 +13,7 @@ update your version of Podman to the latest possible and retry your command befo
 an issue.
 
 If you are filing a bug against `podman build`, please instead file a bug
-against Buildah (https://github.com/projectatomic/buildah/issues). Podman build
+against Buildah (https://github.com/containers/buildah/issues). Podman build
 executes Buildah to perform container builds, and as such the Buildah
 maintainers are best equipped to handle these bugs.
 -->

Dockerfile

@@ -88,8 +88,8 @@ RUN set -x \
 # Install buildah
 RUN set -x \
        && export GOPATH=/go \
-       && git clone https://github.com/projectatomic/buildah "$GOPATH/src/github.com/projectatomic/buildah" \
+       && git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
-       && cd "$GOPATH/src/github.com/projectatomic/buildah" \
+       && cd "$GOPATH/src/github.com/containers/buildah" \
        && make \
        && make install
 

Dockerfile.CentOS

@@ -45,8 +45,8 @@ RUN set -x \
 # Install buildah
 RUN set -x \
        && export GOPATH=/go \
-       && git clone https://github.com/projectatomic/buildah "$GOPATH/src/github.com/projectatomic/buildah" \
+       && git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
-       && cd "$GOPATH/src/github.com/projectatomic/buildah" \
+       && cd "$GOPATH/src/github.com/containers/buildah" \
        && make \
        && make install
 

Dockerfile.Fedora

@@ -48,8 +48,8 @@ RUN set -x \
 # Install buildah
 RUN set -x \
        && export GOPATH=/go \
-       && git clone https://github.com/projectatomic/buildah "$GOPATH/src/github.com/projectatomic/buildah" \
+       && git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
-       && cd "$GOPATH/src/github.com/projectatomic/buildah" \
+       && cd "$GOPATH/src/github.com/containers/buildah" \
        && make \
        && make install
 

README.md

@@ -30,7 +30,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect
 - Images: Image management using [containers/image](https://github.com/containers/image)
 - Storage: Container and image storage is managed by [containers/storage](https://github.com/containers/storage)
 - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni)
-- Builds: Builds are supported via [Buildah](https://github.com/projectatomic/buildah).
+- Builds: Builds are supported via [Buildah](https://github.com/containers/buildah).
 - Conmon: [Conmon](https://github.com/kubernetes-sigs/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package
 
 ## Podman Information for Developers
@@ -78,7 +78,7 @@ Information about contributing to this project.
 
 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.
@@ -104,4 +104,4 @@ 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).

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 := ""

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"
 )
 

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"
 )
 

contrib/spec/podman.spec.in

@@ -142,7 +142,7 @@ Provides: bundled(golang(github.com/ostreedev/ostree-go)) = master
 Provides: bundled(golang(github.com/pkg/errors)) = v0.8.0
 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2
 Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
-Provides: bundled(golang(github.com/projectatomic/buildah)) = a2c8358455f9b6a254c572455af2a0afcfcec544
+Provides: bundled(golang(github.com/containers/buildah)) = a2c8358455f9b6a254c572455af2a0afcfcec544
 Provides: bundled(golang(github.com/seccomp/containers-golang)) = master
 Provides: bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.0
 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0

libpod/container_commit.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"strings"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/libpod/libpod/image"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 

libpod/runtime_img.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/containers/buildah/imagebuildah"
 	"github.com/containers/libpod/libpod/common"
 	"github.com/containers/libpod/libpod/image"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/archive"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/imagebuildah"
 )
 
 // Runtime API

pkg/varlinkapi/images.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/imagebuildah"
 	"github.com/containers/image/docker"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/types"
@@ -21,8 +23,6 @@ import (
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/imagebuildah"
 )
 
 // ListImages lists all the images in the store

vendor.conf

@@ -90,7 +90,7 @@ k8s.io/kube-openapi 275e2ce91dec4c05a4094a7b1daee5560b555ac9 https://github.com/
 k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils
 github.com/mrunalp/fileutils master
 github.com/varlink/go master
-github.com/projectatomic/buildah af5bbde0180026ae87b7fc81c2dc124aa73ec959
+github.com/containers/buildah 19e44f087d5371c86a75bb2ab904c5b98519fa69
 github.com/Nvveen/Gotty master
 github.com/fsouza/go-dockerclient master
 github.com/openshift/imagebuilder master

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)
+[![Go Report Card](https://goreportcard.com/badge/github.com/containers/buildah)](https://goreportcard.com/report/github.com/containers/buildah)
-[![Travis](https://travis-ci.org/projectatomic/buildah.svg?branch=master)](https://travis-ci.org/projectatomic/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
 

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"
 )
 

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"
 )

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 (

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 (

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"

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"
 )
 

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"

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