switch projectatomic to containers

Need to get some small changes into libpod to pull back into buildah
to complete buildah transition.

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

Closes: #1270
Approved by: mheon

.papr.sh

@@ -3,7 +3,7 @@ set -xeuo pipefail
 
 export GOPATH=/go
 export PATH=$HOME/gopath/bin:$PATH
-export GOSRC=/$GOPATH/src/github.com/projectatomic/libpod
+export GOSRC=/$GOPATH/src/github.com/containers/libpod
 
 
 # PAPR adds a merge commit, for testing, which fails the

.papr_prepare.sh

@@ -14,4 +14,4 @@ fi
 ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log
 
 # Run the tests
-${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST $IMAGE sh .papr.sh
+${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST $IMAGE sh .papr.sh

API.md

@@ -1,6 +1,6 @@
 # io.podman
 Podman Service Interface and API description.  The master version of this document can be found
-in the [API.md](https://github.com/projectatomic/libpod/blob/master/API.md) file in the upstream libpod repository.
+in the [API.md](https://github.com/containers/libpod/blob/master/API.md) file in the upstream libpod repository.
 ## Index
 
 [func AttachToContainer() NotImplemented](#AttachToContainer)

CONTRIBUTING.md

@@ -13,7 +13,7 @@ that we follow.
 ## Reporting Issues
 
 Before reporting an issue, check our backlog of
-[open issues](https://github.com/projectatomic/libpod/issues)
+[open issues](https://github.com/containers/libpod/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.
@@ -128,9 +128,9 @@ For general questions and discussion, please use the
 IRC `#podman` channel on `irc.freenode.net`.
 
 For discussions around issues/bugs and features, you can use the github
-[issues](https://github.com/projectatomic/libpod/issues)
+[issues](https://github.com/containers/libpod/issues)
 and
-[PRs](https://github.com/projectatomic/libpod/pulls)
+[PRs](https://github.com/containers/libpod/pulls)
 tracking system.
 
 [owners]: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md#owners

Dockerfile

@@ -45,9 +45,9 @@ RUN apt-get update && apt-get install -y \
     --no-install-recommends \
     && apt-get clean
 
-ADD . /go/src/github.com/projectatomic/libpod
+ADD . /go/src/github.com/containers/libpod
 
-RUN set -x && cd /go/src/github.com/projectatomic/libpod && make install.libseccomp.sudo
+RUN set -x && cd /go/src/github.com/containers/libpod && make install.libseccomp.sudo
 
 # Install runc
 ENV RUNC_COMMIT ad0f5255060d36872be04de22f8731f38ef2d7b1
@@ -124,7 +124,7 @@ RUN pip3 install varlink
 COPY test/policy.json /etc/containers/policy.json
 COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml
 
-WORKDIR /go/src/github.com/projectatomic/libpod
+WORKDIR /go/src/github.com/containers/libpod
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers,
 # and allow testing of apparmor.

Dockerfile.CentOS

@@ -90,7 +90,7 @@ RUN mkdir -p /etc/containers
 COPY test/policy.json /etc/containers/policy.json
 COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml
 
-WORKDIR /go/src/github.com/projectatomic/libpod
+WORKDIR /go/src/github.com/containers/libpod
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers,
 # and allow testing of apparmor.

Dockerfile.Fedora

@@ -95,7 +95,7 @@ COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redh
 # Install varlink stuff
 RUN pip3 install varlink
 
-WORKDIR /go/src/github.com/projectatomic/libpod
+WORKDIR /go/src/github.com/containers/libpod
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers,
 # and allow testing of apparmor.

Makefile

@@ -4,7 +4,7 @@ EPOCH_TEST_COMMIT ?= 7d116f5f73520e6db389f28e9963f0137a27d52d
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
-PROJECT := github.com/projectatomic/libpod
+PROJECT := github.com/containers/libpod
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_BRANCH_CLEAN ?= $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 LIBPOD_IMAGE ?= libpod_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
@@ -31,7 +31,7 @@ BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
 OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d
 
 SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
-PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/projectatomic/libpod/vendor | grep -v e2e)
+PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/containers/libpod/vendor | grep -v e2e)
 
 COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
 GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")

cmd/podman/attach.go

@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/batchcontainer/container.go

@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/sirupsen/logrus"
 )
 

cmd/podman/build.go

@@ -6,13 +6,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"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/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/cleanup.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/commit.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 
 	"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/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 

cmd/podman/common.go

@@ -6,10 +6,10 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/storage"
 	"github.com/fatih/camelcase"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/create.go

@@ -9,21 +9,21 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
+	ann "github.com/containers/libpod/pkg/annotations"
+	"github.com/containers/libpod/pkg/apparmor"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
+	"github.com/containers/libpod/pkg/util"
+	libpodVersion "github.com/containers/libpod/version"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	ann "github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/projectatomic/libpod/pkg/apparmor"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
-	"github.com/projectatomic/libpod/pkg/util"
-	libpodVersion "github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/create_cli.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	cc "github.com/containers/libpod/pkg/spec"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/pkg/errors"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/sirupsen/logrus"
 )
 

cmd/podman/diff.go

@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

cmd/podman/exec.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/export.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/formats/formats_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/projectatomic/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/inspect"
 )
 
 func TestSetJSONFormatEncoder(t *testing.T) {

cmd/podman/history.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	units "github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 

cmd/podman/images.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/docker/go-units"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 

cmd/podman/import.go

@@ -8,11 +8,11 @@ import (
 	"net/url"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 

cmd/podman/info.go

@@ -3,10 +3,10 @@ package main
 import (
 	"runtime"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/inspect.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 

cmd/podman/kill.go

@@ -5,9 +5,9 @@ import (
 	"syscall"
 
 	"fmt"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

cmd/podman/libpodruntime/runtime.go

@@ -5,10 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/urfave/cli"
 )
 

cmd/podman/load.go

@@ -9,9 +9,9 @@ import (
 	"github.com/containers/image/directory"
 	dockerarchive "github.com/containers/image/docker/archive"
 	ociarchive "github.com/containers/image/oci/archive"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 

cmd/podman/login.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/containers/image/docker"
 	"github.com/containers/image/pkg/docker/config"
+	"github.com/containers/libpod/libpod/common"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )

cmd/podman/logout.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/containers/image/pkg/docker/config"
+	"github.com/containers/libpod/libpod/common"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 )
 

cmd/podman/logs.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"bufio"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/main.go

@@ -7,12 +7,12 @@ import (
 	"runtime/pprof"
 	"syscall"
 
+	"github.com/containers/libpod/pkg/hooks"
+	_ "github.com/containers/libpod/pkg/hooks/0.1.0"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/version"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/hooks"
-	_ "github.com/projectatomic/libpod/pkg/hooks/0.1.0"
-	"github.com/projectatomic/libpod/pkg/rootless"
-	"github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	lsyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/urfave/cli"

cmd/podman/mount.go

@@ -4,9 +4,9 @@ import (
 	js "encoding/json"
 	"fmt"
 
+	of "github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	of "github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pause.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

cmd/podman/pod_create.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_inspect.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 
 	"fmt"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/pod_kill.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"syscall"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_pause.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_ps.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 

cmd/podman/pod_restart.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_rm.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_start.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_stop.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/pod_unpause.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/port.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/ps.go

@@ -8,14 +8,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"k8s.io/apimachinery/pkg/fields"

cmd/podman/pull.go

@@ -9,10 +9,10 @@ import (
 	dockerarchive "github.com/containers/image/docker/archive"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	image2 "github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	image2 "github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/push.go

@@ -9,11 +9,11 @@ import (
 	"github.com/containers/image/directory"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 

cmd/podman/refresh.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

cmd/podman/restart.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/rm.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/rmi.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 
@@ -97,7 +97,7 @@ func rmiCmd(c *cli.Context) error {
 		// Note that we have to query the storage one-by-one to
 		// always get the latest state for each image.  Otherwise, we
 		// run inconsistency issues, for instance, with repoTags.
-		// See https://github.com/projectatomic/libpod/issues/930 as
+		// See https://github.com/containers/libpod/issues/930 as
 		// an exemplary inconsistency issue.
 		for _, i := range images {
 			newImage, err := runtime.ImageRuntime().NewFromLocal(i)

cmd/podman/run.go

@@ -9,13 +9,13 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/run_test.go

@@ -4,11 +4,11 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
 	units "github.com/docker/go-units"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli"
 )

cmd/podman/save.go

@@ -12,10 +12,10 @@ import (
 	"github.com/containers/image/manifest"
 	ociarchive "github.com/containers/image/oci/archive"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	libpodImage "github.com/containers/libpod/libpod/image"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	libpodImage "github.com/projectatomic/libpod/libpod/image"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/search.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 
 	"github.com/containers/image/docker"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/common"
+	sysreg "github.com/containers/libpod/pkg/registries"
 	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/common"
-	sysreg "github.com/projectatomic/libpod/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/sigproxy.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"syscall"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/docker/pkg/signal"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 )
 

cmd/podman/start.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/stats.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	tm "github.com/buger/goterm"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/stop.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/tag.go

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

cmd/podman/top.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/umount.go

@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/podman/unpause.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

cmd/podman/utils.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	gosignal "os/signal"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/term"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"

cmd/podman/varlink.go

@@ -5,11 +5,11 @@ package main
 import (
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	iopodman "github.com/containers/libpod/cmd/podman/varlink"
+	"github.com/containers/libpod/pkg/varlinkapi"
+	"github.com/containers/libpod/version"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	iopodman "github.com/projectatomic/libpod/cmd/podman/varlink"
-	"github.com/projectatomic/libpod/pkg/varlinkapi"
-	"github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"github.com/varlink/go/varlink"
@@ -59,7 +59,7 @@ func varlinkCmd(c *cli.Context) error {
 		"Atomic",
 		"podman",
 		version.Version,
-		"https://github.com/projectatomic/libpod",
+		"https://github.com/containers/libpod",
 	)
 	if err != nil {
 		return errors.Wrapf(err, "unable to create new varlink service")

cmd/podman/varlink/io.podman.varlink

@@ -1,5 +1,5 @@
 # Podman Service Interface and API description.  The master version of this document can be found
-# in the [API.md](https://github.com/projectatomic/libpod/blob/master/API.md) file in the upstream libpod repository.
+# in the [API.md](https://github.com/containers/libpod/blob/master/API.md) file in the upstream libpod repository.
 interface io.podman
 
 

cmd/podman/version.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/podman/wait.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 

contrib/python/podman/README.md

@@ -2,7 +2,7 @@
 
 ## Status: Active Development
 
-See [libpod](https://github.com/projectatomic/libpod)
+See [libpod](https://github.com/containers/libpod)
 
 ## Releases
 

contrib/python/podman/setup.py

@@ -25,7 +25,7 @@ setup(
     packages=find_packages(exclude=['test']),
     python_requires='>=3',
     zip_safe=True,
-    url='http://github.com/projectatomic/libpod',
+    url='http://github.com/containers/libpod',
     keywords='varlink libpod podman',
     classifiers=[
         'Development Status :: 3 - Alpha',

contrib/python/pypodman/README.md

@@ -2,7 +2,7 @@
 
 ## Status: Active Development
 
-See [libpod](https://github.com/projectatomic/libpod/contrib/python/pypodman)
+See [libpod](https://github.com/containers/libpod/contrib/python/pypodman)
 
 ## Releases
 

contrib/python/pypodman/setup.py

@@ -27,7 +27,7 @@ setup(
     packages=find_packages(exclude=['test']),
     python_requires='>=3',
     zip_safe=True,
-    url='http://github.com/projectatomic/libpod',
+    url='http://github.com/containers/libpod',
     keywords='varlink libpod podman pypodman',
     classifiers=[
         'Development Status :: 3 - Alpha',

contrib/spec/podman.spec.in

@@ -23,9 +23,9 @@
 
 %global provider github
 %global provider_tld com
-%global project projectatomic
+%global project containers
 %global repo libpod
-# https://github.com/projectatomic/libpod
+# https://github.com/containers/libpod
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}

contrib/spec/python-podman.spec.in

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

docs/tutorials/README.md

@@ -4,6 +4,6 @@
 
 ## Links to a number of useful tutorials for the Podman utility.
 
-**[Introduction Tutorial](https://github.com/projectatomic/libpod/tree/master/docs/tutorials/podman_tutorial.md)**
+**[Introduction Tutorial](https://github.com/containers/libpod/tree/master/docs/tutorials/podman_tutorial.md)**
 
 Learn how to setup Podman and perform some basic commands with the utility.

docs/tutorials/podman_tutorial.md

@@ -31,8 +31,8 @@ and make libpod.
 ```console
 $ export GOPATH=~/go
 $ mkdir -p $GOPATH
-$ git clone https://github.com/projectatomic/libpod/ $GOPATH/src/github.com/projectatomic/libpod
+$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod
-$ cd $GOPATH/src/github.com/projectatomic/libpod
+$ cd $GOPATH/src/github.com/containers/libpod
 $ make
 $ sudo make install PREFIX=/usr
 ```
@@ -91,8 +91,8 @@ $ sudo cp runc /usr/bin/runc
 
 ### Building and installing Podman
 ```console
-$ git clone https://github.com/projectatomic/libpod/ $GOPATH/src/github.com/projectatomic/libpod
+$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod
-$ cd $GOPATH/src/github.com/projectatomic/libpod
+$ cd $GOPATH/src/github.com/containers/libpod
 $ make
 $ sudo make install PREFIX=/usr
 ```

install.md

@@ -73,15 +73,15 @@ apt-get install -y \
 Debian, Ubuntu, and related distributions will also need to do the following setup:
 
  * A copy of the development libraries for `ostree`, either in the form of the `libostree-dev` package from the [flatpak](https://launchpad.net/~alexlarsson/+archive/ubuntu/flatpak) PPA, or built [from source](https://github.com/ostreedev/ostree) (more on that [here](https://ostree.readthedocs.io/en/latest/#building)).
- * [Add required configuration files](https://github.com/projectatomic/libpod/blob/master/docs/tutorials/podman_tutorial.md#adding-required-configuration-files)
+ * [Add required configuration files](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#adding-required-configuration-files)
  * Install conmon, CNI plugins and runc
-   * [Install conmon](https://github.com/projectatomic/libpod/blob/master/docs/tutorials/podman_tutorial.md#building-and-installing-conmon)
+   * [Install conmon](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#building-and-installing-conmon)
-   * [Install CNI plugins](https://github.com/projectatomic/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-cni-plugins)
+   * [Install CNI plugins](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-cni-plugins)
-   * [runc Installation](https://github.com/projectatomic/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-runc) - Although installable, the latest runc is not available in the Ubuntu repos. Version 1.0.0-rc4 is the minimal requirement.
+   * [runc Installation](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-runc) - Although installable, the latest runc is not available in the Ubuntu repos. Version 1.0.0-rc4 is the minimal requirement.
 
 **NOTE**
 
-If using an older release or a long-term support release, be careful to double-check that the version of `runc` is new enough (running `runc --version` should produce `spec: 1.0.0`), or else [build](https://github.com/projectatomic/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-runc) your own.
+If using an older release or a long-term support release, be careful to double-check that the version of `runc` is new enough (running `runc --version` should produce `spec: 1.0.0`), or else [build](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-runc) your own.
 
 Be careful to double-check that the version of golang is new enough, version 1.8.x or higher is required.  If needed, golang kits are available at https://golang.org/dl/
 
@@ -122,7 +122,7 @@ Next, clone the source code using:
 ```bash
 mkdir -p $GOPATH/src/github.com/projectatomic
 cd $_ # or cd $GOPATH/src/github.com/projectatomic
-git clone https://github.com/projectatomic/libpod # or your fork
+git clone https://github.com/containers/libpod # or your fork
 cd libpod
 ```
 

libpod/container_api.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/libpod/driver"
+	"github.com/containers/libpod/pkg/inspect"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/docker/docker/daemon/caps"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/driver"
-	"github.com/projectatomic/libpod/pkg/inspect"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/remotecommand"

libpod/container_attach.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/containers/libpod/pkg/kubeutils"
+	"github.com/containers/libpod/utils"
 	"github.com/docker/docker/pkg/term"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/kubeutils"
-	"github.com/projectatomic/libpod/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"k8s.io/client-go/tools/remotecommand"

libpod/container_commit.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 
 	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/projectatomic/libpod/libpod/image"
 	"github.com/sirupsen/logrus"
 )
 

libpod/container_ffjson.go

@@ -1,5 +1,5 @@
 // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
-// source: /home/mcs/code/gopath//src/github.com/projectatomic/libpod/libpod/container.go
+// source: /home/mcs/code/gopath//src/github.com/containers/libpod/libpod/container.go
 
 package libpod
 

libpod/container_inspect.go

@@ -1,8 +1,8 @@
 package libpod
 
 import (
+	"github.com/containers/libpod/pkg/inspect"
 	"github.com/cri-o/ocicni/pkg/ocicni"
-	"github.com/projectatomic/libpod/pkg/inspect"
 	"github.com/sirupsen/logrus"
 )
 

libpod/container_internal.go

@@ -13,6 +13,12 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containers/libpod/pkg/chrootuser"
+	"github.com/containers/libpod/pkg/hooks"
+	"github.com/containers/libpod/pkg/hooks/exec"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/pkg/secrets"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/containers/storage/pkg/chrootarchive"
@@ -22,12 +28,6 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/chrootuser"
-	"github.com/projectatomic/libpod/pkg/hooks"
-	"github.com/projectatomic/libpod/pkg/hooks/exec"
-	"github.com/projectatomic/libpod/pkg/rootless"
-	"github.com/projectatomic/libpod/pkg/secrets"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/ulule/deepcopier"
 	"golang.org/x/text/language"

libpod/container_internal_linux.go

@@ -10,14 +10,14 @@ import (
 	"syscall"
 	"time"
 
+	crioAnnotations "github.com/containers/libpod/pkg/annotations"
+	"github.com/containers/libpod/pkg/chrootuser"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/storage/pkg/idtools"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/projectatomic/libpod/pkg/chrootuser"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )

libpod/diff.go

@@ -1,9 +1,9 @@
 package libpod
 
 import (
+	"github.com/containers/libpod/libpod/layers"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/layers"
 )
 
 // GetDiff returns the differences between the two images, layers, or containers

libpod/driver/driver.go

@@ -1,8 +1,8 @@
 package driver
 
 import (
+	"github.com/containers/libpod/pkg/inspect"
 	cstorage "github.com/containers/storage"
-	"github.com/projectatomic/libpod/pkg/inspect"
 )
 
 // GetDriverName returns the name of the driver for the given store

libpod/image/filters.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/projectatomic/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/inspect"
 )
 
 // ResultFilter is a mock function for image filtering

libpod/image/image.go

@@ -18,16 +18,16 @@ import (
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/libpod/common"
+	"github.com/containers/libpod/libpod/driver"
+	"github.com/containers/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/registries"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/common"
-	"github.com/projectatomic/libpod/libpod/driver"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	"github.com/projectatomic/libpod/pkg/registries"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 )
 

libpod/image/pull.go

@@ -18,9 +18,9 @@ import (
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/pkg/registries"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/registries"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 )
 

libpod/in_memory_state.go

@@ -3,9 +3,9 @@ package libpod
 import (
 	"strings"
 
+	"github.com/containers/libpod/pkg/registrar"
 	"github.com/containers/storage/pkg/truncindex"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/registrar"
 )
 
 // TODO: Maybe separate idIndex for pod/containers

libpod/info.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/utils"
 	"github.com/containers/storage/pkg/system"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/utils"
 )
 
 // InfoData holds the info type, i.e store, host etc and the data for each type

libpod/networking_linux.go

@@ -14,11 +14,11 @@ import (
 
 	cnitypes "github.com/containernetworking/cni/pkg/types/current"
 	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/containers/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/netns"
+	"github.com/containers/libpod/utils"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	"github.com/projectatomic/libpod/pkg/netns"
-	"github.com/projectatomic/libpod/utils"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/sys/unix"

libpod/networking_unsupported.go

@@ -3,7 +3,7 @@
 package libpod
 
 import (
-	"github.com/projectatomic/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/inspect"
 )
 
 func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) {

libpod/oci.go

@@ -15,21 +15,21 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containers/libpod/pkg/ctime"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/coreos/go-systemd/activation"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/ctime"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	kwait "k8s.io/apimachinery/pkg/util/wait"
 
 	// TODO import these functions into libpod and remove the import
 	// Trying to keep libpod from depending on CRI-O code
-	"github.com/projectatomic/libpod/utils"
+	"github.com/containers/libpod/utils"
 )
 
 // OCI code is undergoing heavy rewrite

libpod/oci_linux.go

@@ -12,9 +12,9 @@ import (
 	"sync"
 
 	"github.com/containerd/cgroups"
+	"github.com/containers/libpod/utils"
 	"github.com/containers/storage/pkg/idtools"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/libpod/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )

libpod/pod_ffjson.go

@@ -1,5 +1,5 @@
 // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
-// source: /home/mcs/code/gopath//src/github.com/projectatomic/libpod/libpod/pod.go
+// source: /home/dwalsh/go/src/github.com/containers/libpod/libpod/pod.go
 
 package libpod
 

libpod/runtime.go

@@ -11,14 +11,14 @@ import (
 	"github.com/BurntSushi/toml"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/hooks"
+	sysreg "github.com/containers/libpod/pkg/registries"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/hooks"
-	sysreg "github.com/projectatomic/libpod/pkg/registries"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"github.com/ulule/deepcopier"
 )

libpod/runtime_img.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"io"
 
+	"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"
-	"github.com/projectatomic/libpod/libpod/common"
-	"github.com/projectatomic/libpod/libpod/image"
 )
 
 // Runtime API

libpod/runtime_img_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	sysreg "github.com/projectatomic/libpod/pkg/registries"
+	sysreg "github.com/containers/libpod/pkg/registries"
 	"github.com/stretchr/testify/assert"
 )