diff options
130 files changed, 334 insertions, 293 deletions
@@ -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 diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 177a751a8..987dcc267 100644 --- a/.papr_prepare.sh +++ b/.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 @@ -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) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b0e99549..fa95bfe3a 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/Dockerfile b/Dockerfile index 24be23e46..48988def4 100644 --- a/Dockerfile +++ b/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. diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS index ccd4fd154..368f9255c 100644 --- a/Dockerfile.CentOS +++ b/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. diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index 983b754b9..74bae9eb0 100644 --- a/Dockerfile.Fedora +++ b/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. @@ -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}") diff --git a/cmd/podman/attach.go b/cmd/podman/attach.go index f615ce026..91c5f654d 100644 --- a/cmd/podman/attach.go +++ b/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" ) diff --git a/cmd/podman/batchcontainer/container.go b/cmd/podman/batchcontainer/container.go index e27914174..364b28d40 100644 --- a/cmd/podman/batchcontainer/container.go +++ b/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" ) diff --git a/cmd/podman/build.go b/cmd/podman/build.go index c33193882..e35fd10a4 100644 --- a/cmd/podman/build.go +++ b/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" ) diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go index 33b0fad45..a71b3f48a 100644 --- a/cmd/podman/cleanup.go +++ b/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" ) diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go index 8d3c124bf..03210dc35 100644 --- a/cmd/podman/commit.go +++ b/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" ) diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 93fa9653a..8ce3066c0 100644 --- a/cmd/podman/common.go +++ b/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" ) diff --git a/cmd/podman/create.go b/cmd/podman/create.go index ad6f53b55..96934560f 100644 --- a/cmd/podman/create.go +++ b/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" ) diff --git a/cmd/podman/create_cli.go b/cmd/podman/create_cli.go index d0ad28595..812b62058 100644 --- a/cmd/podman/create_cli.go +++ b/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" ) diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index 9dca25050..f5a2d60ad 100644 --- a/cmd/podman/diff.go +++ b/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" ) diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go index a42cdf63a..17a17f703 100644 --- a/cmd/podman/exec.go +++ b/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" ) diff --git a/cmd/podman/export.go b/cmd/podman/export.go index 16c1f5c9b..20faac7d8 100644 --- a/cmd/podman/export.go +++ b/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" ) diff --git a/cmd/podman/formats/formats_test.go b/cmd/podman/formats/formats_test.go index fc7f01f93..c75109d65 100644 --- a/cmd/podman/formats/formats_test.go +++ b/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) { diff --git a/cmd/podman/history.go b/cmd/podman/history.go index 2570dcc7d..2ae0dff66 100644 --- a/cmd/podman/history.go +++ b/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" ) diff --git a/cmd/podman/images.go b/cmd/podman/images.go index 364c8a91c..024b6e240 100644 --- a/cmd/podman/images.go +++ b/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" ) diff --git a/cmd/podman/import.go b/cmd/podman/import.go index 8a50d4fb9..4f7786c42 100644 --- a/cmd/podman/import.go +++ b/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" ) diff --git a/cmd/podman/info.go b/cmd/podman/info.go index f03d23c5b..cd66943a4 100644 --- a/cmd/podman/info.go +++ b/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" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 6aaf9b694..1fa8f55a2 100644 --- a/cmd/podman/inspect.go +++ b/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" ) diff --git a/cmd/podman/kill.go b/cmd/podman/kill.go index 99e111177..388c779f6 100644 --- a/cmd/podman/kill.go +++ b/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" ) diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index f1f2b963c..e33b70e9a 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/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" ) diff --git a/cmd/podman/load.go b/cmd/podman/load.go index ffef9f6a6..fbc1f3cd0 100644 --- a/cmd/podman/load.go +++ b/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" ) diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 113760318..92417e1a1 100644 --- a/cmd/podman/login.go +++ b/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" ) diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index c06c69073..97631f827 100644 --- a/cmd/podman/logout.go +++ b/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" ) diff --git a/cmd/podman/logs.go b/cmd/podman/logs.go index 26ca2330f..67ec038c3 100644 --- a/cmd/podman/logs.go +++ b/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" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 7a669b3fe..e72998c8f 100644 --- a/cmd/podman/main.go +++ b/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" diff --git a/cmd/podman/mount.go b/cmd/podman/mount.go index df1bacc5f..6cda9dbd3 100644 --- a/cmd/podman/mount.go +++ b/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" ) diff --git a/cmd/podman/pause.go b/cmd/podman/pause.go index f97a1c61b..12ff747a7 100644 --- a/cmd/podman/pause.go +++ b/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" ) diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go index c14496f5a..568ace6e7 100644 --- a/cmd/podman/pod_create.go +++ b/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" ) diff --git a/cmd/podman/pod_inspect.go b/cmd/podman/pod_inspect.go index 6935335a6..1370c9471 100644 --- a/cmd/podman/pod_inspect.go +++ b/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" ) diff --git a/cmd/podman/pod_kill.go b/cmd/podman/pod_kill.go index 48f4eaa7a..3cd9bf7c9 100644 --- a/cmd/podman/pod_kill.go +++ b/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" ) diff --git a/cmd/podman/pod_pause.go b/cmd/podman/pod_pause.go index df51a037b..0e2e797f5 100644 --- a/cmd/podman/pod_pause.go +++ b/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" ) diff --git a/cmd/podman/pod_ps.go b/cmd/podman/pod_ps.go index 0f5c7a51d..1c030f266 100644 --- a/cmd/podman/pod_ps.go +++ b/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" ) diff --git a/cmd/podman/pod_restart.go b/cmd/podman/pod_restart.go index fe802fc9d..62e93b316 100644 --- a/cmd/podman/pod_restart.go +++ b/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" ) diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go index 983203374..549fa0290 100644 --- a/cmd/podman/pod_rm.go +++ b/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" ) diff --git a/cmd/podman/pod_start.go b/cmd/podman/pod_start.go index e35ec7993..b6ba5719b 100644 --- a/cmd/podman/pod_start.go +++ b/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" ) diff --git a/cmd/podman/pod_stop.go b/cmd/podman/pod_stop.go index 97d248b30..ac6781408 100644 --- a/cmd/podman/pod_stop.go +++ b/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" ) diff --git a/cmd/podman/pod_unpause.go b/cmd/podman/pod_unpause.go index 5dd5c79e4..d599baba9 100644 --- a/cmd/podman/pod_unpause.go +++ b/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" ) diff --git a/cmd/podman/port.go b/cmd/podman/port.go index 9082ec25d..e3933f925 100644 --- a/cmd/podman/port.go +++ b/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" ) diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index a5f862f8f..94e8a4920 100644 --- a/cmd/podman/ps.go +++ b/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" diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index a1d685735..f1666113b 100644 --- a/cmd/podman/pull.go +++ b/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" ) diff --git a/cmd/podman/push.go b/cmd/podman/push.go index 3c2e59e58..79758257a 100644 --- a/cmd/podman/push.go +++ b/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" ) diff --git a/cmd/podman/refresh.go b/cmd/podman/refresh.go index 8a1cee717..8e4fd9ae9 100644 --- a/cmd/podman/refresh.go +++ b/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" ) diff --git a/cmd/podman/restart.go b/cmd/podman/restart.go index 08e8b615b..89484f895 100644 --- a/cmd/podman/restart.go +++ b/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" ) diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index c0ec7d9f6..1d580ac7e 100644 --- a/cmd/podman/rm.go +++ b/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" ) diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index 95e98a038..c1c3869c8 100644 --- a/cmd/podman/rmi.go +++ b/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) diff --git a/cmd/podman/run.go b/cmd/podman/run.go index efc7f2dd0..997068a55 100644 --- a/cmd/podman/run.go +++ b/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" ) diff --git a/cmd/podman/run_test.go b/cmd/podman/run_test.go index a421c4a20..397b3bb71 100644 --- a/cmd/podman/run_test.go +++ b/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" ) diff --git a/cmd/podman/save.go b/cmd/podman/save.go index f5fd421a4..8186718d4 100644 --- a/cmd/podman/save.go +++ b/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" ) diff --git a/cmd/podman/search.go b/cmd/podman/search.go index d71432fc6..cc18cd1de 100644 --- a/cmd/podman/search.go +++ b/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" ) diff --git a/cmd/podman/sigproxy.go b/cmd/podman/sigproxy.go index 388e23439..16861bad0 100644 --- a/cmd/podman/sigproxy.go +++ b/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" ) diff --git a/cmd/podman/start.go b/cmd/podman/start.go index 3dde306d7..f0f205892 100644 --- a/cmd/podman/start.go +++ b/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" ) diff --git a/cmd/podman/stats.go b/cmd/podman/stats.go index d1015801f..cb89b8a9d 100644 --- a/cmd/podman/stats.go +++ b/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" ) diff --git a/cmd/podman/stop.go b/cmd/podman/stop.go index 820d1acb2..d1fae56dd 100644 --- a/cmd/podman/stop.go +++ b/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" ) diff --git a/cmd/podman/tag.go b/cmd/podman/tag.go index d1d1693a3..5c81fe7f8 100644 --- a/cmd/podman/tag.go +++ b/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" ) diff --git a/cmd/podman/top.go b/cmd/podman/top.go index 7db71ab16..43728893c 100644 --- a/cmd/podman/top.go +++ b/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" ) diff --git a/cmd/podman/umount.go b/cmd/podman/umount.go index 1e364b48f..33556b2ea 100644 --- a/cmd/podman/umount.go +++ b/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" ) diff --git a/cmd/podman/unpause.go b/cmd/podman/unpause.go index 6571dff4e..d0c622b8a 100644 --- a/cmd/podman/unpause.go +++ b/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" ) diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index 2d19e312c..89ec48dbe 100644 --- a/cmd/podman/utils.go +++ b/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" diff --git a/cmd/podman/varlink.go b/cmd/podman/varlink.go index 71cf86c74..4e6d76c7e 100644 --- a/cmd/podman/varlink.go +++ b/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") diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index 2cc381c5a..263f38494 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/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 diff --git a/cmd/podman/version.go b/cmd/podman/version.go index 952cf32d3..f896229c4 100644 --- a/cmd/podman/version.go +++ b/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" ) diff --git a/cmd/podman/wait.go b/cmd/podman/wait.go index 142e0e599..929b66761 100644 --- a/cmd/podman/wait.go +++ b/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" ) diff --git a/contrib/python/podman/README.md b/contrib/python/podman/README.md index ec4a0480b..3254064b0 100644 --- a/contrib/python/podman/README.md +++ b/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 diff --git a/contrib/python/podman/setup.py b/contrib/python/podman/setup.py index a342c05fd..2953ba0dc 100644 --- a/contrib/python/podman/setup.py +++ b/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', diff --git a/contrib/python/pypodman/README.md b/contrib/python/pypodman/README.md index 935f6a631..6991daffa 100644 --- a/contrib/python/pypodman/README.md +++ b/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 diff --git a/contrib/python/pypodman/setup.py b/contrib/python/pypodman/setup.py index 0509bf942..0f80d4060 100644 --- a/contrib/python/pypodman/setup.py +++ b/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', diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 31a70fbde..efebabeb4 100644 --- a/contrib/spec/podman.spec.in +++ b/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} diff --git a/contrib/spec/python-podman.spec.in b/contrib/spec/python-podman.spec.in index 04b6039ad..6296586dd 100644 --- a/contrib/spec/python-podman.spec.in +++ b/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# diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md index 5cf60303d..ad0c5ae88 100644 --- a/docs/tutorials/README.md +++ b/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. diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md index 31203aec2..89e3968f6 100644 --- a/docs/tutorials/podman_tutorial.md +++ b/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 -$ cd $GOPATH/src/github.com/projectatomic/libpod +$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/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 -$ cd $GOPATH/src/github.com/projectatomic/libpod +$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod +$ cd $GOPATH/src/github.com/containers/libpod $ make $ sudo make install PREFIX=/usr ``` diff --git a/install.md b/install.md index 6c9681166..f0353faeb 100644 --- a/install.md +++ b/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 CNI plugins](https://github.com/projectatomic/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. + * [Install conmon](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#building-and-installing-conmon) + * [Install CNI plugins](https://github.com/containers/libpod/blob/master/docs/tutorials/podman_tutorial.md#installing-cni-plugins) + * [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 ``` diff --git a/libpod/container_api.go b/libpod/container_api.go index 62281218f..3e5b6ea53 100644 --- a/libpod/container_api.go +++ b/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" diff --git a/libpod/container_attach.go b/libpod/container_attach.go index 5bfea3a0e..3c4e0775d 100644 --- a/libpod/container_attach.go +++ b/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" diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 929850cbe..de659c982 100644 --- a/libpod/container_commit.go +++ b/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" ) diff --git a/libpod/container_ffjson.go b/libpod/container_ffjson.go index 2af9d63f5..4ae77eb0c 100644 --- a/libpod/container_ffjson.go +++ b/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 diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index dec0b47b4..a7ee911a6 100644 --- a/libpod/container_inspect.go +++ b/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" ) diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 535f34200..32036ca7a 100644 --- a/libpod/container_internal.go +++ b/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" diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 59fb6af87..2aba1abde 100644 --- a/libpod/container_internal_linux.go +++ b/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" ) diff --git a/libpod/diff.go b/libpod/diff.go index 6e07f3049..e86a186ed 100644 --- a/libpod/diff.go +++ b/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 diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index d84ce8d3c..717ac2a4d 100644 --- a/libpod/driver/driver.go +++ b/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 diff --git a/libpod/image/filters.go b/libpod/image/filters.go index 95ef3b44a..d0c3adfb5 100644 --- a/libpod/image/filters.go +++ b/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 diff --git a/libpod/image/image.go b/libpod/image/image.go index 57891a463..2c70c6316 100644 --- a/libpod/image/image.go +++ b/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" ) diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 6c470b552..d8483878e 100644 --- a/libpod/image/pull.go +++ b/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" ) diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go index 0327b331e..78e765ccd 100644 --- a/libpod/in_memory_state.go +++ b/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 diff --git a/libpod/info.go b/libpod/info.go index 1108845ea..3add1ce0f 100644 --- a/libpod/info.go +++ b/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 diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 2186b4ac9..e5f935e30 100644 --- a/libpod/networking_linux.go +++ b/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" diff --git a/libpod/networking_unsupported.go b/libpod/networking_unsupported.go index 070985c47..3a8ac4455 100644 --- a/libpod/networking_unsupported.go +++ b/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) { diff --git a/libpod/oci.go b/libpod/oci.go index d98ab433f..9021a522b 100644 --- a/libpod/oci.go +++ b/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 diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index dacc92c62..335a7eec3 100644 --- a/libpod/oci_linux.go +++ b/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" ) diff --git a/libpod/pod_ffjson.go b/libpod/pod_ffjson.go index 58b08d61b..a244dadbc 100644 --- a/libpod/pod_ffjson.go +++ b/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 diff --git a/libpod/runtime.go b/libpod/runtime.go index cd5501de1..73f516cd5 100644 --- a/libpod/runtime.go +++ b/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" ) diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 47dad41da..2e4e1b26f 100644 --- a/libpod/runtime_img.go +++ b/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 diff --git a/libpod/runtime_img_test.go b/libpod/runtime_img_test.go index c608c1b25..2bccb2752 100644 --- a/libpod/runtime_img_test.go +++ b/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" ) diff --git a/libpod/version.go b/libpod/version.go index cb3e6b16d..5e7cd83c9 100644 --- a/libpod/version.go +++ b/libpod/version.go @@ -4,7 +4,7 @@ import ( "runtime" "strconv" - podmanVersion "github.com/projectatomic/libpod/version" + podmanVersion "github.com/containers/libpod/version" ) // Overwritten at build time diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go index e10c3d254..4ebc5ff9d 100644 --- a/pkg/hooks/0.1.0/hook.go +++ b/pkg/hooks/0.1.0/hook.go @@ -6,9 +6,9 @@ import ( "errors" "strings" + hooks "github.com/containers/libpod/pkg/hooks" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - hooks "github.com/projectatomic/libpod/pkg/hooks" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" ) // Version is the hook configuration version defined in this package. diff --git a/pkg/hooks/0.1.0/hook_test.go b/pkg/hooks/0.1.0/hook_test.go index 44cb21e3a..66774075e 100644 --- a/pkg/hooks/0.1.0/hook_test.go +++ b/pkg/hooks/0.1.0/hook_test.go @@ -3,8 +3,8 @@ package hook import ( "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" ) diff --git a/pkg/hooks/hooks.go b/pkg/hooks/hooks.go index fdc8a6c46..8a44a4982 100644 --- a/pkg/hooks/hooks.go +++ b/pkg/hooks/hooks.go @@ -7,9 +7,9 @@ import ( "path/filepath" "sync" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/sirupsen/logrus" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go index b93a1d54d..2925a99e4 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -9,8 +9,8 @@ import ( "runtime" "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" "golang.org/x/text/language" ) diff --git a/pkg/hooks/read.go b/pkg/hooks/read.go index 20431bdf1..d3995a0be 100644 --- a/pkg/hooks/read.go +++ b/pkg/hooks/read.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" + current "github.com/containers/libpod/pkg/hooks/1.0.0" "github.com/pkg/errors" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/sirupsen/logrus" ) diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go index 811cace23..606c25df4 100644 --- a/pkg/hooks/read_test.go +++ b/pkg/hooks/read_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" ) diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index c84bb21f6..73aa93d68 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -6,8 +6,8 @@ import ( "github.com/containers/image/pkg/sysregistries" "github.com/containers/image/types" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" ) // userRegistriesFile is the path to the per user registry configuration file. diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go index bc63ece00..6f38f1fd5 100644 --- a/pkg/secrets/secrets.go +++ b/pkg/secrets/secrets.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" + "github.com/containers/libpod/pkg/rootless" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index fb45f042b..6df6fb480 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -7,6 +7,8 @@ import ( "strings" "syscall" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/docker/api/types/container" @@ -15,8 +17,6 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index bceae4677..97305610a 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -4,13 +4,13 @@ import ( "os" "strings" + "github.com/containers/libpod/pkg/rootless" "github.com/docker/docker/daemon/caps" "github.com/docker/docker/pkg/mount" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go index fa1983463..8dd217b77 100644 --- a/pkg/varlinkapi/config.go +++ b/pkg/varlinkapi/config.go @@ -1,8 +1,8 @@ package varlinkapi import ( - iopodman "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + iopodman "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" "github.com/urfave/cli" ) diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index f42386194..df8b66996 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -9,11 +9,11 @@ import ( "syscall" "time" + "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" - "github.com/projectatomic/libpod/cmd/podman/batchcontainer" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" ) // ListContainers ... diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index 5f69a8205..e57f51cc1 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -8,14 +8,14 @@ import ( "strings" "syscall" + "github.com/containers/libpod/cmd/podman/varlink" + "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/docker/docker/api/types/container" "github.com/docker/docker/pkg/signal" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "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" ) diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index ae727d7ad..7953c1fc6 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -12,17 +12,17 @@ import ( "github.com/containers/image/docker" "github.com/containers/image/manifest" "github.com/containers/image/types" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/image" + sysreg "github.com/containers/libpod/pkg/registries" + "github.com/containers/libpod/pkg/util" "github.com/docker/go-units" "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" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/libpod/image" - sysreg "github.com/projectatomic/libpod/pkg/registries" - "github.com/projectatomic/libpod/pkg/util" ) // ListImages lists all the images in the store diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 042aef942..a90b72a6d 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -4,8 +4,8 @@ import ( goruntime "runtime" "strings" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" ) // GetVersion ... diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go index 667c09562..b33e43f96 100644 --- a/pkg/varlinkapi/util.go +++ b/pkg/varlinkapi/util.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "github.com/projectatomic/libpod/cmd/podman/batchcontainer" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" ) // getContext returns a non-nil, empty context diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 1b0c16e4a..466f79ae9 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -14,13 +14,13 @@ import ( "testing" "time" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/inspect" "github.com/containers/storage/pkg/parsers/kernel" "github.com/containers/storage/pkg/reexec" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/pkg/inspect" ) var ( diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index ae0785378..f2a9af6bf 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -48,7 +48,7 @@ var _ = Describe("Podman UserNS support", func() { // It essentially repeats the test above but with the `-it` short option // that broke execution at: - // https://github.com/projectatomic/libpod/pull/1066#issuecomment-403562116 + // https://github.com/containers/libpod/pull/1066#issuecomment-403562116 // To avoid a potential future regression, use this as a test. It("podman uidmapping and gidmapping with short-opts", func() { if os.Getenv("SKIP_USERNS") != "" { diff --git a/vendor.conf b/vendor.conf index e9e8f4aff..2076d395f 100644 --- a/vendor.conf +++ b/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 308ad3d7fc63ee34ed213c2ffa6b345441600b8f +github.com/projectatomic/buildah master github.com/Nvveen/Gotty master github.com/fsouza/go-dockerclient master github.com/openshift/imagebuilder master diff --git a/vendor/github.com/projectatomic/buildah/add.go b/vendor/github.com/projectatomic/buildah/add.go index 93ecba9f4..1aad8ad37 100644 --- a/vendor/github.com/projectatomic/buildah/add.go +++ b/vendor/github.com/projectatomic/buildah/add.go @@ -11,12 +11,12 @@ import ( "syscall" "time" + "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/projectatomic/libpod/pkg/chrootuser" "github.com/sirupsen/logrus" ) diff --git a/vendor/github.com/projectatomic/buildah/buildah.go b/vendor/github.com/projectatomic/buildah/buildah.go index b435895e7..32785a26f 100644 --- a/vendor/github.com/projectatomic/buildah/buildah.go +++ b/vendor/github.com/projectatomic/buildah/buildah.go @@ -146,7 +146,6 @@ type Builder struct { // Image metadata and runtime settings, in multiple formats. OCIv1 v1.Image `json:"ociv1,omitempty"` Docker docker.V2Image `json:"docker,omitempty"` - // DefaultMountsFilePath is the file path holding the mounts to be mounted in "host-path:container-path" format. DefaultMountsFilePath string `json:"defaultMountsFilePath,omitempty"` @@ -292,7 +291,6 @@ type CommonBuildOptions struct { // BuilderOptions are used to initialize a new Builder. type BuilderOptions struct { - // Args define variables that users can pass at build-time to the builder Args map[string]string // FromImage is the name of the image which should be used as the @@ -360,9 +358,7 @@ type BuilderOptions struct { // after processing the AddCapabilities set, when running commands in the // container. If a capability appears in both lists, it will be dropped. DropCapabilities []string - // ImageOnly is a boolean designating that we wish to only pull the image and - // to not create a container from it. Used by pull command. - ImageOnly bool + CommonBuildOpts *CommonBuildOptions } diff --git a/vendor/github.com/projectatomic/buildah/chroot/run.go b/vendor/github.com/projectatomic/buildah/chroot/run.go index 286f3c7ac..2cae5b9da 100644 --- a/vendor/github.com/projectatomic/buildah/chroot/run.go +++ b/vendor/github.com/projectatomic/buildah/chroot/run.go @@ -933,7 +933,7 @@ func setupChrootBindMounts(spec *specs.Spec, bundlePath string) (undoBinds func( } logrus.Debugf("bind mounted %q to %q", "/dev", filepath.Join(spec.Root.Path, "/dev")) - // Bind /proc read-write. + // Bind /proc read-only. subProc := filepath.Join(spec.Root.Path, "/proc") if err := unix.Mount("/proc", subProc, "bind", procFlags, ""); err != nil { if os.IsNotExist(err) { @@ -1131,6 +1131,15 @@ func setupChrootBindMounts(spec *specs.Spec, bundlePath string) (undoBinds func( } } + // Create an empty directory for to use for masking directories. + roEmptyDir := filepath.Join(bundlePath, "empty") + if len(spec.Linux.MaskedPaths) > 0 { + if err := os.Mkdir(roEmptyDir, 0700); err != nil { + return undoBinds, errors.Wrapf(err, "error creating empty directory %q", roEmptyDir) + } + removes = append(removes, roEmptyDir) + } + // Set up any masked paths that we need to. If we're running inside of // a container, some of these locations will already be read-only tmpfs // filesystems or bind mounted to os.DevNull. If we're not running @@ -1218,10 +1227,10 @@ func setupChrootBindMounts(spec *specs.Spec, bundlePath string) (undoBinds func( } } } - // The target's a directory, so mount a read-only tmpfs on it. - roFlags := uintptr(syscall.MS_NOSUID | syscall.MS_NODEV | syscall.MS_NOEXEC | syscall.MS_RDONLY) + // The target's a directory, so read-only bind mount an empty directory on it. + roFlags := uintptr(syscall.MS_BIND | syscall.MS_NOSUID | syscall.MS_NODEV | syscall.MS_NOEXEC | syscall.MS_RDONLY) if !isReadOnly || (hasContent && isAccessible) { - if err = unix.Mount("none", target, "tmpfs", roFlags, "size=0"); err != nil { + if err = unix.Mount(roEmptyDir, target, "bind", roFlags, ""); err != nil { return undoBinds, errors.Wrapf(err, "error masking directory %q in mount namespace", target) } if err = unix.Statfs(target, &fs); err != nil { diff --git a/vendor/github.com/projectatomic/buildah/config.go b/vendor/github.com/projectatomic/buildah/config.go index b39d2b6c6..731e3b80a 100644 --- a/vendor/github.com/projectatomic/buildah/config.go +++ b/vendor/github.com/projectatomic/buildah/config.go @@ -3,6 +3,7 @@ package buildah import ( "context" "encoding/json" + "os" "path/filepath" "runtime" "strings" @@ -260,11 +261,21 @@ func (b *Builder) Env() []string { // built using an image built from this container. func (b *Builder) SetEnv(k string, v string) { reset := func(s *[]string) { + getenv := func(name string) string { + for i := range *s { + val := strings.SplitN((*s)[i], "=", 2) + if len(val) == 2 && val[0] == name { + return val[1] + } + } + return name + } n := []string{} for i := range *s { if !strings.HasPrefix((*s)[i], k+"=") { n = append(n, (*s)[i]) } + v = os.Expand(v, getenv) } n = append(n, k+"="+v) *s = n diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index c7182e15e..bcdcfb678 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -96,6 +96,8 @@ type BuildOptions struct { // is supplied, the message will be sent to Err (or os.Stderr, if Err // is nil) by default. Log func(format string, args ...interface{}) + // In is connected to stdin for RUN instructions. + In io.Reader // Out is a place where non-error log messages are sent. Out io.Writer // Err is a place where error log messages should be sent. @@ -190,6 +192,7 @@ type Executor struct { outputFormat string additionalTags []string log func(format string, args ...interface{}) + in io.Reader out io.Writer err io.Writer signaturePolicyPath string @@ -471,11 +474,15 @@ func (b *Executor) Run(run imagebuilder.Run, config docker.Config) error { if b.builder == nil { return errors.Errorf("no build container available") } - devNull, err := os.Open(os.DevNull) - if err != nil { - return errors.Errorf("error opening %q for reading: %v", os.DevNull, err) + stdin := b.in + if stdin == nil { + devNull, err := os.Open(os.DevNull) + if err != nil { + return errors.Errorf("error opening %q for reading: %v", os.DevNull, err) + } + defer devNull.Close() + stdin = devNull } - defer devNull.Close() options := buildah.RunOptions{ Hostname: config.Hostname, Runtime: b.runtime, @@ -486,7 +493,7 @@ func (b *Executor) Run(run imagebuilder.Run, config docker.Config) error { WorkingDir: config.WorkingDir, Entrypoint: config.Entrypoint, Cmd: config.Cmd, - Stdin: devNull, + Stdin: stdin, Stdout: b.out, Stderr: b.err, Quiet: b.quiet, @@ -504,7 +511,7 @@ func (b *Executor) Run(run imagebuilder.Run, config docker.Config) error { if err := b.volumeCacheSave(); err != nil { return err } - err = b.builder.Run(args, options) + err := b.builder.Run(args, options) if err2 := b.volumeCacheRestore(); err2 != nil { if err == nil { return err2 @@ -557,6 +564,7 @@ func NewExecutor(store storage.Store, options BuildOptions) (*Executor, error) { volumeCache: make(map[string]string), volumeCacheInfo: make(map[string]os.FileInfo), log: options.Log, + in: options.In, out: options.Out, err: options.Err, reportWriter: options.ReportWriter, diff --git a/vendor/github.com/projectatomic/buildah/new.go b/vendor/github.com/projectatomic/buildah/new.go index 60d217552..1895bae48 100644 --- a/vendor/github.com/projectatomic/buildah/new.go +++ b/vendor/github.com/projectatomic/buildah/new.go @@ -66,7 +66,13 @@ func reserveSELinuxLabels(store storage.Store, id string) error { } func pullAndFindImage(ctx context.Context, store storage.Store, imageName string, options BuilderOptions, sc *types.SystemContext) (*storage.Image, types.ImageReference, error) { - ref, err := pullImage(ctx, store, imageName, options, sc) + pullOptions := PullOptions{ + ReportWriter: options.ReportWriter, + Store: store, + SystemContext: options.SystemContext, + Transport: options.Transport, + } + ref, err := pullImage(ctx, store, imageName, pullOptions, sc) if err != nil { logrus.Debugf("error pulling image %q: %v", imageName, err) return nil, nil, err @@ -248,15 +254,6 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions defer src.Close() } - // If the pull command was used, we only pull the image, - // we don't create a container. - if options.ImageOnly { - imgBuilder := &Builder{ - FromImageID: imageID, - } - return imgBuilder, nil - } - name := "working-container" if options.Container != "" { name = options.Container diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go index de3326842..39a1773e4 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go +++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go @@ -176,10 +176,6 @@ var ( Name: "squash", Usage: "Squash newly built layers into a single new layer. The build process does not currently support caching so this is a NOOP.", }, - cli.BoolTFlag{ - Name: "stream", - Usage: "There is no daemon in use, so this command is a NOOP.", - }, cli.StringSliceFlag{ Name: "tag, t", Usage: "tagged `name` to apply to the built image", diff --git a/vendor/github.com/projectatomic/buildah/pull.go b/vendor/github.com/projectatomic/buildah/pull.go index e9ce03f02..48d7f76ed 100644 --- a/vendor/github.com/projectatomic/buildah/pull.go +++ b/vendor/github.com/projectatomic/buildah/pull.go @@ -2,6 +2,7 @@ package buildah import ( "context" + "io" "strings" cp "github.com/containers/image/copy" @@ -20,6 +21,28 @@ import ( "github.com/sirupsen/logrus" ) +// PullOptions can be used to alter how an image is copied in from somewhere. +type PullOptions struct { + // SignaturePolicyPath specifies an override location for the signature + // policy which should be used for verifying the new image as it is + // being written. Except in specific circumstances, no value should be + // specified, indicating that the shared, system-wide default policy + // should be used. + SignaturePolicyPath string + // ReportWriter is an io.Writer which will be used to log the writing + // of the new image. + ReportWriter io.Writer + // Store is the local storage store which holds the source image. + Store storage.Store + // github.com/containers/image/types SystemContext to hold credentials + // and other authentication/authorization information. + SystemContext *types.SystemContext + // Transport is a value which is prepended to the image's name, if the + // image name alone can not be resolved to a reference to a source + // image. No separator is implicitly added. + Transport string +} + func localImageNameForReference(ctx context.Context, store storage.Store, srcRef types.ImageReference, spec string) (string, error) { if srcRef == nil { return "", errors.Errorf("reference to image is empty") @@ -112,7 +135,13 @@ func localImageNameForReference(ctx context.Context, store storage.Store, srcRef return name, nil } -func pullImage(ctx context.Context, store storage.Store, imageName string, options BuilderOptions, sc *types.SystemContext) (types.ImageReference, error) { +// Pull copies the contents of the image from somewhere else. +func Pull(ctx context.Context, imageName string, options PullOptions) (types.ImageReference, error) { + systemContext := getSystemContext(options.SystemContext, options.SignaturePolicyPath) + return pullImage(ctx, options.Store, imageName, options, systemContext) +} + +func pullImage(ctx context.Context, store storage.Store, imageName string, options PullOptions, sc *types.SystemContext) (types.ImageReference, error) { spec := imageName srcRef, err := alltransports.ParseImageName(spec) if err != nil { @@ -144,12 +173,6 @@ func pullImage(ctx context.Context, store storage.Store, imageName string, optio return nil, errors.Wrapf(err, "error parsing image name %q", destName) } - img, err := srcRef.NewImageSource(ctx, sc) - if err != nil { - return nil, errors.Wrapf(err, "error initializing %q as an image source", spec) - } - img.Close() - policy, err := signature.DefaultPolicy(sc) if err != nil { return nil, errors.Wrapf(err, "error obtaining default signature policy") diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/projectatomic/buildah/run.go index e91b02588..71a76862e 100644 --- a/vendor/github.com/projectatomic/buildah/run.go +++ b/vendor/github.com/projectatomic/buildah/run.go @@ -19,6 +19,7 @@ import ( "time" "github.com/containernetworking/cni/libcni" + "github.com/containers/libpod/pkg/secrets" "github.com/containers/storage/pkg/idtools" "github.com/containers/storage/pkg/ioutils" "github.com/containers/storage/pkg/reexec" @@ -31,7 +32,6 @@ import ( "github.com/projectatomic/buildah/bind" "github.com/projectatomic/buildah/chroot" "github.com/projectatomic/buildah/util" - "github.com/projectatomic/libpod/pkg/secrets" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" "golang.org/x/sys/unix" @@ -1094,7 +1094,7 @@ func (b *Builder) Run(command []string, options RunOptions) error { } } options.Args = append(options.Args, rootlessFlag...) - err = b.runUsingRuntimeSubproc(options, configureNetwork, configureNetworks, []string{"--no-new-keyring", "--no-pivot"}, spec, mountPoint, path, Package+"-"+filepath.Base(path)) + err = b.runUsingRuntimeSubproc(options, configureNetwork, configureNetworks, []string{"--no-new-keyring"}, spec, mountPoint, path, Package+"-"+filepath.Base(path)) default: err = errors.Errorf("don't know how to run this command") } diff --git a/vendor/github.com/projectatomic/buildah/vendor.conf b/vendor/github.com/projectatomic/buildah/vendor.conf index 45f25d8d6..3fec2d1f1 100644 --- a/vendor/github.com/projectatomic/buildah/vendor.conf +++ b/vendor/github.com/projectatomic/buildah/vendor.conf @@ -7,7 +7,7 @@ github.com/seccomp/containers-golang master github.com/containers/image 216acb1bcd2c1abef736ee322e17147ee2b7d76c github.com/containers/storage 17c7d1fee5603ccf6dd97edc14162fc1510e7e23 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716 -github.com/docker/docker b8571fd81c7d2223c9ecbf799c693e3ef1daaea9 +github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00 github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1 github.com/docker/engine-api master github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d @@ -42,7 +42,8 @@ github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460 github.com/pborman/uuid master github.com/pkg/errors master github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac -github.com/projectatomic/libpod master +github.com/containers/libpod master +github.com/containers/libpod master github.com/sirupsen/logrus master github.com/syndtr/gocapability master github.com/tchap/go-patricia master |