diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-16 06:41:15 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-16 17:12:36 +0000 |
| commit | d20f3a51463ce75d139dd830e19a173906b0b0cb (patch) | |
| tree | c4cb4fe0d68ac052149031c590823b033a92fa80 /libpod/oci.go | |
| parent | c0abfaa7c38a8fc897a4c1f64392ace40a5a10c1 (diff) | |
| download | podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.gz podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.bz2 podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.zip | |
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
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 6 |
1 files changed, 3 insertions, 3 deletions
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 |