Move buildah from projecatatomic/buildah to containers/buildah

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

.papr.sh

@@ -3,7 +3,7 @@ set -xeuo pipefail
 
 export GOPATH=$HOME/gopath
 export PATH=$HOME/gopath/bin:$PATH
-export GOSRC=$HOME/gopath/src/github.com/projectatomic/buildah
+export GOSRC=$HOME/gopath/src/github.com/containers/buildah
 
 (mkdir -p $GOSRC && cd /code && cp -r . $GOSRC)
 

.papr.yml

@@ -72,7 +72,7 @@ pulls: true
 
 env:
     GOPATH: /go
-    GOSRC: /go/src/github.com/projectatomic
+    GOSRC: /go/src/github.com/containers
 
 tests:
     - mkdir -p $GOSRC && ln -s /var/tmp/checkout $GOSRC/buildah

CHANGELOG.md

@@ -1,4 +1,4 @@
-![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)
 
 # Changelog
 

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-![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)
 
 # Contributing to Buildah
 
@@ -16,7 +16,7 @@ that we follow.
 ## Reporting Issues
 
 Before reporting an issue, check our backlog of
-[open issues](https://github.com/projectatomic/buildah/issues)
+[open issues](https://github.com/containers/buildah/issues)
 to see if someone else has already reported it. If so, feel free to add
 your scenario, or additional information, to the discussion. Or simply
 "subscribe" to it to be notified when it is updated.
@@ -123,9 +123,9 @@ IRC group on `irc.freenode.net` called `buildah`
 that has been setup.
 
 For discussions around issues/bugs and features, you can use the github
-[issues](https://github.com/projectatomic/buildah/issues)
+[issues](https://github.com/containers/buildah/issues)
 and
-[PRs](https://github.com/projectatomic/buildah/pulls)
+[PRs](https://github.com/containers/buildah/pulls)
 tracking system.
 
 ## Becoming a Maintainer

Makefile

@@ -36,10 +36,10 @@ docs: ## build the docs on the host
 	$(MAKE) -C docs
 
 # For vendoring to work right, the checkout directory must be such that our top
-# level is at $GOPATH/src/github.com/projectatomic/buildah.
+# level is at $GOPATH/src/github.com/containers/buildah.
 .PHONY: gopath
 gopath:
-	test $(shell pwd) = $(shell cd ../../../../src/github.com/projectatomic/buildah ; pwd)
+	test $(shell pwd) = $(shell cd ../../../../src/github.com/containers/buildah ; pwd)
 
 # We use https://github.com/lk4d4/vndr to manage dependencies.
 .PHONY: deps

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
 

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

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

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 (

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 (

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"

chroot/run_test.go

@@ -14,11 +14,11 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/containers/buildah/tests/testreport/types"
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
-	"github.com/projectatomic/buildah/tests/testreport/types"
-	"github.com/projectatomic/buildah/util"
 )
 
 const (

cmd/buildah/addcopy.go

@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/bud.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/buildah/imagebuildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	"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"
 )

cmd/buildah/commit.go

@@ -5,14 +5,14 @@ import (
 	"os"
 	"time"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/storage"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/common.go

@@ -6,13 +6,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/common_test.go

@@ -6,10 +6,10 @@ import (
 	"os/user"
 	"testing"
 
+	"github.com/containers/buildah"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/config.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/mattn/go-shellwords"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/containers.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/from.go

@@ -6,11 +6,11 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	util "github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	util "github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/images.go

@@ -11,11 +11,11 @@ import (
 
 	"encoding/json"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/images_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
-	"github.com/projectatomic/buildah/util"
 )
 
 func TestTemplateOutputValidTemplate(t *testing.T) {

cmd/buildah/inspect.go

@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"text/template"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )

cmd/buildah/main.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/buildah"
 	"github.com/containers/storage"
 	ispecs "github.com/opencontainers/image-spec/specs-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/mount.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/pull.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	util "github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	util "github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/push.go

@@ -5,16 +5,16 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/storage/pkg/archive"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/rename.go

@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/containers/buildah"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/rm.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/rmi.go

@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/run.go

@@ -6,12 +6,12 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/buildah/tag.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/umount.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 

cmd/buildah/unshare.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"syscall"
 
+	"github.com/containers/buildah/unshare"
+	"github.com/containers/buildah/util"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/unshare"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"github.com/urfave/cli"

cmd/buildah/version.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	cniversion "github.com/containernetworking/cni/pkg/version"
+	"github.com/containers/buildah"
 	ispecs "github.com/opencontainers/image-spec/specs-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 

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

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

contrib/docker/Dockerfile

@@ -1,8 +1,8 @@
 FROM fedora
 RUN dnf -y update && dnf -y clean all
 RUN dnf -y install btrfs-progs-devel containers-common device-mapper-devel golang go-md2man gpgme-devel libassuan-devel libseccomp-devel make net-tools ostree-devel runc shadow-utils && dnf -y clean all
-COPY . /go/src/github.com/projectatomic/buildah
-RUN env GOPATH=/go make -C /go/src/github.com/projectatomic/buildah clean all install
+COPY . /go/src/github.com/containers/buildah
+RUN env GOPATH=/go make -C /go/src/github.com/containers/buildah clean all install
 RUN sed -i -r -e 's,driver = ".*",driver = "vfs",g' /etc/containers/storage.conf
 ENV BUILDAH_ISOLATION chroot
 WORKDIR /root

contrib/rpm/buildah.spec

@@ -16,9 +16,9 @@
 
 %global provider        github
 %global provider_tld    com
-%global project         projectatomic
+%global project         containers
 %global repo            buildah
-# https://github.com/projectatomic/buildah
+# https://github.com/containers/buildah
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
 %global commit         REPLACEWITHCOMMITID

demos/README.md

@@ -1,4 +1,4 @@
-![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 Demos
 

developmentplan.md

@@ -1,4 +1,4 @@
-![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)
 
 # Development Plan
 
@@ -10,4 +10,4 @@
 
  * Buildah `buildah bud` command's goal is to have feature parity with other OCI image and container build systems.
 
- * Addressing issues from the community as reported in the [Issues](https://github.com/projectatomic/buildah/issues) page.
+ * Addressing issues from the community as reported in the [Issues](https://github.com/containers/buildah/issues) page.

docs/buildah-add.md

@@ -35,7 +35,7 @@ buildah add containerID '/home/myuser/myfiles.tar' '/tmp'
 
 buildah add containerID '/tmp/workingdir' '/tmp/workingdir'
 
-buildah add containerID 'https://github.com/projectatomic/buildah/blob/master/README.md' '/tmp'
+buildah add containerID 'https://github.com/containers/buildah/blob/master/README.md' '/tmp'
 
 buildah add containerID 'passwd' 'certs.d' /etc
 

docs/buildah-copy.md

@@ -33,7 +33,7 @@ buildah copy containerID '/home/myuser/myfiles.tar' '/tmp'
 
 buildah copy containerID '/tmp/workingdir' '/tmp/workingdir'
 
-buildah copy containerID 'https://github.com/projectatomic/buildah' '/tmp'
+buildah copy containerID 'https://github.com/containers/buildah' '/tmp'
 
 buildah copy containerID 'passwd' 'certs.d' /etc
 

docs/cni-examples/README.md

@@ -1,4 +1,4 @@
-When [buildah](https://github.com/projectatomic/buildah)'s `buildah run`
+When [buildah](https://github.com/containers/buildah)'s `buildah run`
 command is used, or when  `buildah build-using-dockerfile` needs to handle a
 `RUN` instruction, the processes which `buildah` starts are run in their own
 network namespace unless the `--network=host` option is used.

docs/containertools/README.md

@@ -10,7 +10,7 @@ on how they interact amongst each other.
 
 The tools are:  
 
-* [Buildah](https://github.com/projectatomic/buildah)
+* [Buildah](https://github.com/containers/buildah)
 * [CRI-O](https://github.com/kubernetes-sigs/cri-o)
 * [Podman](https://github.com/containers/libpod)
 * [Skopeo](https://github.com/containers/skopeo)
@@ -56,7 +56,7 @@ for authentication.
 
 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.

docs/release-announcements/v0.12.md

@@ -1,8 +1,8 @@
 # Buildah Alpha version 0.12 Release Announcement
 
-![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)
 
-We're pleased to announce the release of Buildah Alpha version 0.12 on both Fedora 26 and Fedora 27. As always, the latest Buildah can also be acquired from [GitHub](https://github.com/projectatomic/buildah) for any other Linux distribution.
+We're pleased to announce the release of Buildah Alpha version 0.12 on both Fedora 26 and Fedora 27. As always, the latest Buildah can also be acquired from [GitHub](https://github.com/containers/buildah) for any other Linux distribution.
 
 The Buildah project has been building some steam over the past several weeks, welcoming several new contributors to the mix, launching new functionality and creating a number of improvements and bug fixes. The major highlights for this release are:
 
@@ -27,6 +27,6 @@ The Buildah project has been building some steam over the past several weeks, we
 
 If you haven’t yet,  install Buildah from the Fedora repository and give it a spin.  We’re betting you'll find it’s an easy and quick way to build containers in your environment without a daemon being involved!
 
-If you haven't joined our community yet, don't wait any longer!  Come join us in [GitHub](https://github.com/projectatomic/buildah), where Open Source communities live.
+If you haven't joined our community yet, don't wait any longer!  Come join us in [GitHub](https://github.com/containers/buildah), where Open Source communities live.
 
 **Buildah == Simplicity**

docs/release-announcements/v0.16.md

@@ -1,6 +1,6 @@
 # Buildah Alpha version 0.16 Release Announcement
 
-![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)
 
 We're pleased to announce the release of Buildah Alpha version 0.16 which is now available from GitHub for any Linux distro.  We will be shipping this release on Fedora, CentOS and Ubuntu in the near future.
 

docs/release-announcements/v1.1.md

@@ -1,6 +1,6 @@
 # Buildah version 1.1 Release Announcement
 
-![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)
 
 We're pleased to announce the release of Buildah version 1.1 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS and Ubuntu in the near future.
 

docs/release-announcements/v1.2.md

@@ -1,6 +1,6 @@
 # Buildah version 1.2 Release Announcement
 
-![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)
 
 We're pleased to announce the release of Buildah version 1.2 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS and Ubuntu in the near future.  
 

docs/release-announcements/v1.3.md

@@ -1,6 +1,6 @@
 # Buildah version 1.3 Release Announcement
 
-![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)
 
 We're pleased to announce the release of Buildah version 1.3 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS, openSUSE and Ubuntu in the near future.
 

docs/tutorials/01-intro.md

@@ -1,4 +1,4 @@
-![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 Tutorial 1
 ## Building OCI container images
@@ -256,6 +256,6 @@ Why not try and modify the Dockerfile. Do not install httpd, but instead ADD the
 
 Well done. You have learned a lot about Buildah using this short tutorial. Hopefully you followed along with the examples and found them to be sufficient. Be sure to look at Buildah's man pages to see the other useful commands you can use. Have fun playing.
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).

docs/tutorials/02-registries-repositories.md

@@ -1,11 +1,11 @@
-![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 Tutorial 2
 ## Using Buildah with container registries
 
 The purpose of this tutorial is to demonstrate how Buildah can be used to move OCI compliant images in and out of private or public registries. 
 
-In the [first tutorial](https://github.com/projectatomic/buildah/blob/master/docs/tutorials/01-intro.md) we built an image from scratch that we called `fedora-bashecho` and we pushed it to a local Docker repository using the `docker-daemon` protocol. We are going to use the same image to push to a private Docker registry.
+In the [first tutorial](https://github.com/containers/buildah/blob/master/docs/tutorials/01-intro.md) we built an image from scratch that we called `fedora-bashecho` and we pushed it to a local Docker repository using the `docker-daemon` protocol. We are going to use the same image to push to a private Docker registry.
 
 First we must pull down a registry. As a shortcut we will save the container name that is returned from the `buildah from` command, into a bash variable called `registry`. This is just like we did in Tutorial 1:
 
@@ -31,7 +31,7 @@ Let's push our image to the private registry. By default, Buildah is set up to e
 
     # buildah push --tls-verify=false fedora-bashecho docker://localhost:5000/ipbabble/fedora-bashecho:latest
 
-[Skopeo](https://github.com/projectatomic/skopeo) is a ProjectAtomic tool that was created to inspect images in registries without having to pull the image from the registry. It has grown to have many other uses. We will verify that the image has been stored by using Skopeo to inspect the image in the registry:
+[Skopeo](https://github.com/containers/skopeo) is a containers tool that was created to inspect images in registries without having to pull the image from the registry. It has grown to have many other uses. We will verify that the image has been stored by using Skopeo to inspect the image in the registry:
  
     # skopeo inspect --tls-verify=false docker://localhost:5000/ipbabble/fedora-bashecho:latest
     {
@@ -129,6 +129,6 @@ Now check that image is in the local containers-storage:
     
 Success!
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Containers Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).

docs/tutorials/03-on-build.md

@@ -182,9 +182,9 @@ Again these aren't the most extensive examples, but they both illustrate how a m
 
 Well done. You have learned about Buildah's ONBUILD functionality using this short tutorial. Hopefully you followed along with the examples and found them to be sufficient. Be sure to look at Buildah's man pages to see the other useful commands you can use. Have fun playing.
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).
 
 [GitHub]: https://github.com/containers/libpod/
 [image specification]: https://github.com/opencontainers/runtime-spec

hack/spc_build.sh

@@ -31,8 +31,8 @@ dnf -y install autoconf automake btrfs-progs-devel \
 echo "Cleanup buildah repo and build again in fedora..."
 make clean
 mv vendor src
-mkdir -p $(pwd)/_build/src/github.com/projectatomic
-ln -s $(pwd) $(pwd)/_build/src/github.com/projectatomic/buildah
+mkdir -p $(pwd)/_build/src/github.com/containers
+ln -s $(pwd) $(pwd)/_build/src/github.com/containers/buildah
 make GOPATH=$(pwd)/_build:$(pwd) all TAGS="seccomp containers_image_ostree_stub"
 GOPATH=$(pwd)/_build:$(pwd) go test -c -tags "seccomp `./btrfs_tag.sh` `./btrfs_installed_tag.sh` `./libdm_tag.sh` `./ostree_tag.sh` `./selinux_tag.sh`" ./cmd/buildah
 tmp=$(mktemp -d); mkdir $tmp/root $tmp/runroot; PATH="$PATH" ./buildah.test -test.v -root $tmp/root -runroot $tmp/runroot -storage-driver vfs -signature-policy $(pwd)/tests/policy.json -registries-conf $(pwd)/tests/registries.conf

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

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

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

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

install.md

@@ -1,4 +1,4 @@
-![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)
 
 # Installation Instructions
 
@@ -46,7 +46,7 @@ The CNI library needs to be configured so that it will know which plugins to
 call to set up namespaces.  Usually, this configuration takes the form of one
 or more configuration files in the `/etc/cni/net.d` directory.  A set of example
 configuration files is included in the
-[`docs/cni-examples`](https://github.com/projectatomic/buildah/tree/master/docs/cni-examples)
+[`docs/cni-examples`](https://github.com/containers/buildah/tree/master/docs/cni-examples)
 directory of this source tree.
 
 ## Package Installation
@@ -102,8 +102,8 @@ Then to install Buildah on Fedora follow the steps in this example:
   mkdir ~/buildah
   cd ~/buildah
   export GOPATH=`pwd`
-  git clone https://github.com/projectatomic/buildah ./src/github.com/projectatomic/buildah
-  cd ./src/github.com/projectatomic/buildah
+  git clone https://github.com/containers/buildah ./src/github.com/containers/buildah
+  cd ./src/github.com/containers/buildah
   make
   sudo make install
   buildah --help
@@ -177,8 +177,8 @@ Then to install Buildah on Ubuntu follow the steps in this example:
   mkdir ~/buildah
   cd ~/buildah
   export GOPATH=`pwd`
-  git clone https://github.com/projectatomic/buildah ./src/github.com/projectatomic/buildah
-  cd ./src/github.com/projectatomic/buildah
+  git clone https://github.com/containers/buildah ./src/github.com/containers/buildah
+  cd ./src/github.com/containers/buildah
   PATH=/usr/lib/go-1.8/bin:$PATH make runc all TAGS="apparmor seccomp"
   sudo make install install.runc
   buildah --help
@@ -268,7 +268,7 @@ containers.  This file is usually provided by the containers-common package.
 
 The link above takes you to the seccomp.json
 
-### [policy.json](https://github.com/projectatomic/skopeo/blob/master/default-policy.json)
+### [policy.json](https://github.com/containers/skopeo/blob/master/default-policy.json)
 
 `/etc/containers/policy.json`
 

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

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

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"

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

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"

tests/bud.bats

@@ -661,7 +661,7 @@ load helpers
 
 @test "bud with Dockerfile from valid URL" {
   target=url-image
-  url=https://raw.githubusercontent.com/projectatomic/buildah/master/tests/bud/from-scratch/Dockerfile
+  url=https://raw.githubusercontent.com/containers/buildah/master/tests/bud/from-scratch/Dockerfile
   run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} ${url}
   [ "$status" -eq 0 ]
   cid=$(buildah from ${target})
@@ -671,7 +671,7 @@ load helpers
 
 @test "bud with Dockerfile from invalid URL" {
   target=url-image
-  url=https://raw.githubusercontent.com/projectatomic/buildah/master/tests/bud/from-scratch/Dockerfile.bogus
+  url=https://raw.githubusercontent.com/containers/buildah/master/tests/bud/from-scratch/Dockerfile.bogus
   run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} ${url}
   [ "$status" -eq 1 ]
 }

tests/bud/use-layers/Dockerfile

@@ -2,5 +2,5 @@ FROM alpine
 RUN mkdir /hello
 VOLUME /var/lib/testdata
 RUN touch file.txt
-ADD https://github.com/projectatomic/buildah/blob/master/README.md /tmp/
+ADD https://github.com/containers/buildah/blob/master/README.md /tmp/
 ENV foo=bar

tests/conformance/README.md

@@ -1,4 +1,4 @@
-![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/Docker Conformance Test Suite
 
@@ -16,7 +16,7 @@ The dependencies for comformance testing include two parts:
 
 ### Install Buildah
 
-Install Buildah using dnf, yum or apt-get, based on your distribution.  Buildah can also be cloned and installed from [GitHub](https://github.com/projectatomic/buildah/blob/master/install.md).
+Install Buildah using dnf, yum or apt-get, based on your distribution.  Buildah can also be cloned and installed from [GitHub](https://github.com/containers/buildah/blob/master/install.md).
  
 ### Install Docker CE
 

tests/e2e/buildah_suite_test.go

@@ -12,6 +12,7 @@ import (
 
 	"encoding/json"
 
+	"github.com/containers/buildah"
 	"github.com/containers/image/copy"
 	"github.com/containers/image/signature"
 	"github.com/containers/image/storage"
@@ -23,7 +24,6 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 )
 
 var (

tests/from.bats

@@ -136,7 +136,7 @@ load helpers
   buildah rm ${cid}
   buildah rmi scratch2 scratch3
 
-  # Github https://github.com/projectatomic/buildah/issues/396#issuecomment-360949396
+  # Github https://github.com/containers/buildah/issues/396#issuecomment-360949396
   cid=$(buildah from --pull=true --signature-policy ${TESTSDIR}/policy.json alpine)
   buildah rm $cid
   buildah tag alpine alpine2

tests/imgtype/imgtype.go

@@ -8,15 +8,15 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/docker"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/manifest"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/docker"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 

tests/test_buildah_build_rpm.sh

@@ -30,7 +30,7 @@ ${PACKAGER} install -y buildah
 # Clone buildah from GitHub.com
 ########
 cd $SBOX
-git clone https://github.com/projectatomic/buildah.git
+git clone https://github.com/containers/buildah.git
 cd $GITROOT
 
 ########

tests/testreport/testreport.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/buildah/tests/testreport/types"
 	"github.com/containers/storage/pkg/mount"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/tests/testreport/types"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"golang.org/x/crypto/ssh/terminal"

troubleshooting.md

@@ -1,4 +1,4 @@
-![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)
 
 # Troubleshooting
 

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

unshare/unshare_test.go

@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )