diff --git a/libcontainer/CONTRIBUTING.md b/libcontainer/CONTRIBUTING.md index 667cc5a6..afe502f8 100644 --- a/libcontainer/CONTRIBUTING.md +++ b/libcontainer/CONTRIBUTING.md @@ -6,7 +6,7 @@ feels wrong or incomplete. ## Reporting Issues -When reporting [issues](https://github.com/docker/libcontainer/issues) +When reporting [issues](https://github.com/opencontainers/runc/libcontainer/issues) on GitHub please include your host OS (Ubuntu 12.04, Fedora 19, etc), the output of `uname -a`. Please include the steps required to reproduce the problem if possible and applicable. @@ -37,7 +37,7 @@ As this build is done using Docker, you can even run this from [OSX](https://git make sh -This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json). +This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/opencontainers/runc/libcontainer/blob/master/sample_configs/minimal.json). Like the previous command, you can run this on OSX too! ### Building libcontainer directly @@ -98,7 +98,7 @@ else is working on the same thing. ### Create issues... Any significant improvement should be documented as [a GitHub -issue](https://github.com/docker/libcontainer/issues) before anybody +issue](https://github.com/opencontainers/runc/libcontainer/issues) before anybody starts working on it. ### ...but check for existing issues first! diff --git a/libcontainer/Dockerfile b/libcontainer/Dockerfile index a8854988..038e5d0b 100644 --- a/libcontainer/Dockerfile +++ b/libcontainer/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y iptables criu=1.5.2-1 && rm -rf /var/li RUN go get golang.org/x/tools/cmd/cover -ENV GOPATH $GOPATH:/go/src/github.com/docker/libcontainer/vendor +ENV GOPATH $GOPATH:/go/src/github.com/opencontainers/runc/libcontainer/vendor RUN go get github.com/docker/docker/pkg/term # setup a playground for us to spawn containers in @@ -15,8 +15,8 @@ RUN mkdir /busybox && \ RUN curl -sSL https://raw.githubusercontent.com/docker/docker/master/hack/dind -o /dind && \ chmod +x /dind -COPY . /go/src/github.com/docker/libcontainer -WORKDIR /go/src/github.com/docker/libcontainer +COPY . /go/src/github.com/opencontainers/runc/libcontainer +WORKDIR /go/src/github.com/opencontainers/runc/libcontainer RUN cp sample_configs/minimal.json /busybox/container.json RUN make direct-install diff --git a/libcontainer/ROADMAP.md b/libcontainer/ROADMAP.md index f5903535..b5e4d4ab 100644 --- a/libcontainer/ROADMAP.md +++ b/libcontainer/ROADMAP.md @@ -3,7 +3,7 @@ This document is a high-level overview of where we want to take libcontainer next. It is a curated selection of planned improvements which are either important, difficult, or both. -For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues). +For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/opencontainers/runc/libcontainer/issues). To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request. diff --git a/libcontainer/cgroups/cgroups.go b/libcontainer/cgroups/cgroups.go index ec9c39da..a08e905c 100644 --- a/libcontainer/cgroups/cgroups.go +++ b/libcontainer/cgroups/cgroups.go @@ -5,7 +5,7 @@ package cgroups import ( "fmt" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) type Manager interface { diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go index f37d8374..3d099d86 100644 --- a/libcontainer/cgroups/fs/apply_raw.go +++ b/libcontainer/cgroups/fs/apply_raw.go @@ -11,8 +11,8 @@ import ( "strconv" "sync" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) var ( diff --git a/libcontainer/cgroups/fs/blkio.go b/libcontainer/cgroups/fs/blkio.go index eadee1ba..3b940554 100644 --- a/libcontainer/cgroups/fs/blkio.go +++ b/libcontainer/cgroups/fs/blkio.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type BlkioGroup struct { diff --git a/libcontainer/cgroups/fs/blkio_test.go b/libcontainer/cgroups/fs/blkio_test.go index 2ed40bf0..485ab1ce 100644 --- a/libcontainer/cgroups/fs/blkio_test.go +++ b/libcontainer/cgroups/fs/blkio_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/docker/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups" ) const ( diff --git a/libcontainer/cgroups/fs/cpu.go b/libcontainer/cgroups/fs/cpu.go index 1cea0189..5afd5b8d 100644 --- a/libcontainer/cgroups/fs/cpu.go +++ b/libcontainer/cgroups/fs/cpu.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strconv" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type CpuGroup struct { diff --git a/libcontainer/cgroups/fs/cpu_test.go b/libcontainer/cgroups/fs/cpu_test.go index dc7f0e0f..f3c1782e 100644 --- a/libcontainer/cgroups/fs/cpu_test.go +++ b/libcontainer/cgroups/fs/cpu_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/docker/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups" ) func TestCpuSetShares(t *testing.T) { diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go index 1c324cbb..4ff4fefe 100644 --- a/libcontainer/cgroups/fs/cpuacct.go +++ b/libcontainer/cgroups/fs/cpuacct.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/system" ) const ( diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go index e0cf4b09..b6c04b0c 100644 --- a/libcontainer/cgroups/fs/cpuset.go +++ b/libcontainer/cgroups/fs/cpuset.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strconv" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type CpusetGroup struct { diff --git a/libcontainer/cgroups/fs/devices.go b/libcontainer/cgroups/fs/devices.go index 32387d87..d621d275 100644 --- a/libcontainer/cgroups/fs/devices.go +++ b/libcontainer/cgroups/fs/devices.go @@ -3,8 +3,8 @@ package fs import ( - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type DevicesGroup struct { diff --git a/libcontainer/cgroups/fs/devices_test.go b/libcontainer/cgroups/fs/devices_test.go index cd786bae..f8422644 100644 --- a/libcontainer/cgroups/fs/devices_test.go +++ b/libcontainer/cgroups/fs/devices_test.go @@ -5,7 +5,7 @@ package fs import ( "testing" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) var ( diff --git a/libcontainer/cgroups/fs/freezer.go b/libcontainer/cgroups/fs/freezer.go index 112ee04c..47f74395 100644 --- a/libcontainer/cgroups/fs/freezer.go +++ b/libcontainer/cgroups/fs/freezer.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type FreezerGroup struct { diff --git a/libcontainer/cgroups/fs/freezer_test.go b/libcontainer/cgroups/fs/freezer_test.go index 9ff1886d..88abb675 100644 --- a/libcontainer/cgroups/fs/freezer_test.go +++ b/libcontainer/cgroups/fs/freezer_test.go @@ -3,7 +3,7 @@ package fs import ( "testing" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) func TestFreezerSetState(t *testing.T) { diff --git a/libcontainer/cgroups/fs/hugetlb.go b/libcontainer/cgroups/fs/hugetlb.go index 4b826493..7f192a9a 100644 --- a/libcontainer/cgroups/fs/hugetlb.go +++ b/libcontainer/cgroups/fs/hugetlb.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type HugetlbGroup struct { diff --git a/libcontainer/cgroups/fs/hugetlb_test.go b/libcontainer/cgroups/fs/hugetlb_test.go index 7dc0e753..39c3ee65 100644 --- a/libcontainer/cgroups/fs/hugetlb_test.go +++ b/libcontainer/cgroups/fs/hugetlb_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) const ( diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go index 49bfa58a..55ab56f4 100644 --- a/libcontainer/cgroups/fs/memory.go +++ b/libcontainer/cgroups/fs/memory.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type MemoryGroup struct { diff --git a/libcontainer/cgroups/fs/memory_test.go b/libcontainer/cgroups/fs/memory_test.go index 25cd5a1d..d7b5e5f4 100644 --- a/libcontainer/cgroups/fs/memory_test.go +++ b/libcontainer/cgroups/fs/memory_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/docker/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups" ) const ( diff --git a/libcontainer/cgroups/fs/net_cls.go b/libcontainer/cgroups/fs/net_cls.go index 50ca647a..23335dd7 100644 --- a/libcontainer/cgroups/fs/net_cls.go +++ b/libcontainer/cgroups/fs/net_cls.go @@ -1,8 +1,8 @@ package fs import ( - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type NetClsGroup struct { diff --git a/libcontainer/cgroups/fs/net_prio.go b/libcontainer/cgroups/fs/net_prio.go index 62882f9f..88f2ea8b 100644 --- a/libcontainer/cgroups/fs/net_prio.go +++ b/libcontainer/cgroups/fs/net_prio.go @@ -1,8 +1,8 @@ package fs import ( - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type NetPrioGroup struct { diff --git a/libcontainer/cgroups/fs/net_prio_test.go b/libcontainer/cgroups/fs/net_prio_test.go index 878775a5..0ef4955b 100644 --- a/libcontainer/cgroups/fs/net_prio_test.go +++ b/libcontainer/cgroups/fs/net_prio_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) var ( diff --git a/libcontainer/cgroups/fs/perf_event.go b/libcontainer/cgroups/fs/perf_event.go index 2b349270..30be9e56 100644 --- a/libcontainer/cgroups/fs/perf_event.go +++ b/libcontainer/cgroups/fs/perf_event.go @@ -3,8 +3,8 @@ package fs import ( - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type PerfEventGroup struct { diff --git a/libcontainer/cgroups/fs/stats_util_test.go b/libcontainer/cgroups/fs/stats_util_test.go index 19226207..b1777cc0 100644 --- a/libcontainer/cgroups/fs/stats_util_test.go +++ b/libcontainer/cgroups/fs/stats_util_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/Sirupsen/logrus" - "github.com/docker/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups" ) func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error { diff --git a/libcontainer/cgroups/fs/util_test.go b/libcontainer/cgroups/fs/util_test.go index 0344c8ed..0f362560 100644 --- a/libcontainer/cgroups/fs/util_test.go +++ b/libcontainer/cgroups/fs/util_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "testing" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) type cgroupTestUtil struct { diff --git a/libcontainer/cgroups/systemd/apply_nosystemd.go b/libcontainer/cgroups/systemd/apply_nosystemd.go index 9b605b3c..fa3485f1 100644 --- a/libcontainer/cgroups/systemd/apply_nosystemd.go +++ b/libcontainer/cgroups/systemd/apply_nosystemd.go @@ -5,8 +5,8 @@ package systemd import ( "fmt" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type Manager struct { diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go index 9aa6f0af..5497e14b 100644 --- a/libcontainer/cgroups/systemd/apply_systemd.go +++ b/libcontainer/cgroups/systemd/apply_systemd.go @@ -13,9 +13,9 @@ import ( "time" systemd "github.com/coreos/go-systemd/dbus" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/cgroups/fs" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups/fs" + "github.com/opencontainers/runc/libcontainer/configs" "github.com/godbus/dbus" ) @@ -237,7 +237,7 @@ func (m *Manager) Apply(pid int) error { return err } // FIXME: Systemd does have `BlockIODeviceWeight` property, but we got problem - // using that (at least on systemd 208, see https://github.com/docker/libcontainer/pull/354), + // using that (at least on systemd 208, see https://github.com/opencontainers/runc/libcontainer/pull/354), // so use fs work around for now. if err := joinBlkio(c, pid); err != nil { return err diff --git a/libcontainer/configs/validate/config.go b/libcontainer/configs/validate/config.go index 98926dd2..848a67c3 100644 --- a/libcontainer/configs/validate/config.go +++ b/libcontainer/configs/validate/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) type Validator interface { diff --git a/libcontainer/console_linux.go b/libcontainer/console_linux.go index e35ac529..3ac6bfec 100644 --- a/libcontainer/console_linux.go +++ b/libcontainer/console_linux.go @@ -7,7 +7,7 @@ import ( "syscall" "unsafe" - "github.com/docker/libcontainer/label" + "github.com/opencontainers/runc/libcontainer/label" ) // newConsole returns an initalized console that can be used within a container by copying bytes diff --git a/libcontainer/container.go b/libcontainer/container.go index 17f2f21b..567fc681 100644 --- a/libcontainer/container.go +++ b/libcontainer/container.go @@ -5,7 +5,7 @@ package libcontainer import ( - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) // The status of a container. diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go index 215f35d3..eb9999c8 100644 --- a/libcontainer/container_linux.go +++ b/libcontainer/container_linux.go @@ -14,9 +14,9 @@ import ( "syscall" "github.com/Sirupsen/logrus" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/criurpc" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/criurpc" "github.com/golang/protobuf/proto" ) diff --git a/libcontainer/container_linux_test.go b/libcontainer/container_linux_test.go index a70a102e..73577f5c 100644 --- a/libcontainer/container_linux_test.go +++ b/libcontainer/container_linux_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" ) type mockCgroupManager struct { diff --git a/libcontainer/devices/devices_unix.go b/libcontainer/devices/devices_unix.go index a4df06c3..c02b73e3 100644 --- a/libcontainer/devices/devices_unix.go +++ b/libcontainer/devices/devices_unix.go @@ -10,7 +10,7 @@ import ( "path/filepath" "syscall" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) var ( diff --git a/libcontainer/devices/devices_windows.go b/libcontainer/devices/devices_windows.go index bd477f8c..b2a9aa34 100644 --- a/libcontainer/devices/devices_windows.go +++ b/libcontainer/devices/devices_windows.go @@ -1,7 +1,7 @@ package devices import ( - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) // TODO Windows. This can be factored out further - Devices are not supported diff --git a/libcontainer/docs/man/nsinit.1.md b/libcontainer/docs/man/nsinit.1.md index 898dba23..f6f2775a 100644 --- a/libcontainer/docs/man/nsinit.1.md +++ b/libcontainer/docs/man/nsinit.1.md @@ -1,5 +1,5 @@ % nsinit User Manual -% docker/libcontainer +% opencontainers/runc/libcontainer % JAN 2015 NAME: diff --git a/libcontainer/factory.go b/libcontainer/factory.go index 2b3ff85d..f0ccb52e 100644 --- a/libcontainer/factory.go +++ b/libcontainer/factory.go @@ -1,7 +1,7 @@ package libcontainer import ( - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) type Factory interface { diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go index 26b351ac..f6fb64b3 100644 --- a/libcontainer/factory_linux.go +++ b/libcontainer/factory_linux.go @@ -14,11 +14,11 @@ import ( "syscall" "github.com/docker/docker/pkg/mount" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/cgroups/fs" - "github.com/docker/libcontainer/cgroups/systemd" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/configs/validate" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups/fs" + "github.com/opencontainers/runc/libcontainer/cgroups/systemd" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs/validate" ) const ( diff --git a/libcontainer/factory_linux_test.go b/libcontainer/factory_linux_test.go index 00e39739..1adcb262 100644 --- a/libcontainer/factory_linux_test.go +++ b/libcontainer/factory_linux_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/docker/docker/pkg/mount" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) func newTestRoot() (string, error) { diff --git a/libcontainer/generic_error.go b/libcontainer/generic_error.go index ff4d7248..6fbc2d75 100644 --- a/libcontainer/generic_error.go +++ b/libcontainer/generic_error.go @@ -6,7 +6,7 @@ import ( "text/template" "time" - "github.com/docker/libcontainer/stacktrace" + "github.com/opencontainers/runc/libcontainer/stacktrace" ) var errorTemplate = template.Must(template.New("error").Parse(`Timestamp: {{.Timestamp}} diff --git a/libcontainer/hack/validate.sh b/libcontainer/hack/validate.sh index 3c170545..0bf1541f 100755 --- a/libcontainer/hack/validate.sh +++ b/libcontainer/hack/validate.sh @@ -5,7 +5,7 @@ set -e validate() { export MAKEDIR=/go/src/github.com/docker/docker/hack/make - sed -i 's!docker/docker!docker/libcontainer!' /go/src/github.com/docker/docker/hack/make/.validate + sed -i 's!docker/docker!opencontainers/runc/libcontainer!' /go/src/github.com/docker/docker/hack/make/.validate bash /go/src/github.com/docker/docker/hack/make/validate-dco bash /go/src/github.com/docker/docker/hack/make/validate-gofmt go get golang.org/x/tools/cmd/vet diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index f36e354f..a21d1a7e 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -10,13 +10,13 @@ import ( "syscall" "github.com/Sirupsen/logrus" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/netlink" - "github.com/docker/libcontainer/seccomp" - "github.com/docker/libcontainer/system" - "github.com/docker/libcontainer/user" - "github.com/docker/libcontainer/utils" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/netlink" + "github.com/opencontainers/runc/libcontainer/seccomp" + "github.com/opencontainers/runc/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/user" + "github.com/opencontainers/runc/libcontainer/utils" ) type initType string diff --git a/libcontainer/integration/checkpoint_test.go b/libcontainer/integration/checkpoint_test.go index 512ea451..db31fe21 100644 --- a/libcontainer/integration/checkpoint_test.go +++ b/libcontainer/integration/checkpoint_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/docker/libcontainer" + "github.com/opencontainers/runc/libcontainer" ) func TestCheckpoint(t *testing.T) { diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go index 50383bac..5effa20a 100644 --- a/libcontainer/integration/exec_test.go +++ b/libcontainer/integration/exec_test.go @@ -10,9 +10,9 @@ import ( "syscall" "testing" - "github.com/docker/libcontainer" - "github.com/docker/libcontainer/cgroups/systemd" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer" + "github.com/opencontainers/runc/libcontainer/cgroups/systemd" + "github.com/opencontainers/runc/libcontainer/configs" ) func TestExecPS(t *testing.T) { diff --git a/libcontainer/integration/execin_test.go b/libcontainer/integration/execin_test.go index 7ff3975f..d7f2348d 100644 --- a/libcontainer/integration/execin_test.go +++ b/libcontainer/integration/execin_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/docker/libcontainer" + "github.com/opencontainers/runc/libcontainer" ) func TestExecIn(t *testing.T) { diff --git a/libcontainer/integration/init_test.go b/libcontainer/integration/init_test.go index 28466036..eaa6caf6 100644 --- a/libcontainer/integration/init_test.go +++ b/libcontainer/integration/init_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/Sirupsen/logrus" - "github.com/docker/libcontainer" - "github.com/docker/libcontainer/cgroups/systemd" - _ "github.com/docker/libcontainer/nsenter" + "github.com/opencontainers/runc/libcontainer" + "github.com/opencontainers/runc/libcontainer/cgroups/systemd" + _ "github.com/opencontainers/runc/libcontainer/nsenter" ) // init runs the libcontainer initialization code because of the busybox style needs diff --git a/libcontainer/integration/template_test.go b/libcontainer/integration/template_test.go index cb991b41..b4858b90 100644 --- a/libcontainer/integration/template_test.go +++ b/libcontainer/integration/template_test.go @@ -3,7 +3,7 @@ package integration import ( "syscall" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/configs" ) var standardEnvironment = []string{ diff --git a/libcontainer/integration/utils_test.go b/libcontainer/integration/utils_test.go index 0f918133..96050338 100644 --- a/libcontainer/integration/utils_test.go +++ b/libcontainer/integration/utils_test.go @@ -12,8 +12,8 @@ import ( "syscall" "testing" - "github.com/docker/libcontainer" - "github.com/docker/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer" + "github.com/opencontainers/runc/libcontainer/configs" ) func newStdBuffers() *stdBuffers { diff --git a/libcontainer/label/label_selinux.go b/libcontainer/label/label_selinux.go index c8fba845..886861a3 100644 --- a/libcontainer/label/label_selinux.go +++ b/libcontainer/label/label_selinux.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/docker/libcontainer/selinux" + "github.com/opencontainers/runc/libcontainer/selinux" ) // InitLabels returns the process label and file labels to be used within diff --git a/libcontainer/label/label_selinux_test.go b/libcontainer/label/label_selinux_test.go index 6ab0c67c..ac9bc08c 100644 --- a/libcontainer/label/label_selinux_test.go +++ b/libcontainer/label/label_selinux_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/libcontainer/selinux" + "github.com/opencontainers/runc/libcontainer/selinux" ) func TestInit(t *testing.T) { diff --git a/libcontainer/network_linux.go b/libcontainer/network_linux.go index b88009ff..fc564a0f 100644 --- a/libcontainer/network_linux.go +++ b/libcontainer/network_linux.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/netlink" - "github.com/docker/libcontainer/utils" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/netlink" + "github.com/opencontainers/runc/libcontainer/utils" ) var strategies = map[string]networkStrategy{ diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go index 4a448c22..ec640f27 100644 --- a/libcontainer/process_linux.go +++ b/libcontainer/process_linux.go @@ -12,8 +12,8 @@ import ( "strconv" "syscall" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/system" ) type parentProcess interface { diff --git a/libcontainer/restored_process.go b/libcontainer/restored_process.go index 978b1a1d..89dfa041 100644 --- a/libcontainer/restored_process.go +++ b/libcontainer/restored_process.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/system" ) func newRestoredProcess(pid int, fds []string) (*restoredProcess, error) { diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go index 0b0c3815..33b9122f 100644 --- a/libcontainer/rootfs_linux.go +++ b/libcontainer/rootfs_linux.go @@ -14,9 +14,9 @@ import ( "time" "github.com/docker/docker/pkg/symlink" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/label" + "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/label" ) const defaultMountFlags = syscall.MS_NOEXEC | syscall.MS_NOSUID | syscall.MS_NODEV diff --git a/libcontainer/sample_configs/minimal.json b/libcontainer/sample_configs/minimal.json index c2f74109..d1ca6b91 100644 --- a/libcontainer/sample_configs/minimal.json +++ b/libcontainer/sample_configs/minimal.json @@ -2,7 +2,7 @@ "no_pivot_root": false, "parent_death_signal": 0, "pivot_dir": "", - "rootfs": "/home/michael/development/gocode/src/github.com/docker/libcontainer", + "rootfs": "/home/michael/development/gocode/src/github.com/opencontainers/runc/libcontainer", "readonlyfs": false, "mounts": [ { diff --git a/libcontainer/selinux/selinux.go b/libcontainer/selinux/selinux.go index e2cdec93..2771bb50 100644 --- a/libcontainer/selinux/selinux.go +++ b/libcontainer/selinux/selinux.go @@ -16,7 +16,7 @@ import ( "syscall" "github.com/docker/docker/pkg/mount" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/system" ) const ( diff --git a/libcontainer/selinux/selinux_test.go b/libcontainer/selinux/selinux_test.go index 228ad836..ed1dd5f4 100644 --- a/libcontainer/selinux/selinux_test.go +++ b/libcontainer/selinux/selinux_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/docker/libcontainer/selinux" + "github.com/opencontainers/runc/libcontainer/selinux" ) func testSetfilecon(t *testing.T) { diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go index f77219d2..334d3e25 100644 --- a/libcontainer/setns_init_linux.go +++ b/libcontainer/setns_init_linux.go @@ -5,9 +5,9 @@ package libcontainer import ( "os" - "github.com/docker/libcontainer/apparmor" - "github.com/docker/libcontainer/label" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/apparmor" + "github.com/opencontainers/runc/libcontainer/label" + "github.com/opencontainers/runc/libcontainer/system" ) // linuxSetnsInit performs the container's initialization for running a new process diff --git a/libcontainer/stacktrace/capture_test.go b/libcontainer/stacktrace/capture_test.go index 3f435d51..83379302 100644 --- a/libcontainer/stacktrace/capture_test.go +++ b/libcontainer/stacktrace/capture_test.go @@ -18,7 +18,7 @@ func TestCaptureTestFunc(t *testing.T) { if expected := "captureFunc"; frame.Function != expected { t.Fatalf("expteced function %q but recevied %q", expected, frame.Function) } - if expected := "github.com/docker/libcontainer/stacktrace"; frame.Package != expected { + if expected := "github.com/opencontainers/runc/libcontainer/stacktrace"; frame.Package != expected { t.Fatalf("expected package %q but received %q", expected, frame.Package) } if expected := "capture_test.go"; frame.File != expected { diff --git a/libcontainer/stacktrace/frame_test.go b/libcontainer/stacktrace/frame_test.go index ae95ec48..c6fc78e0 100644 --- a/libcontainer/stacktrace/frame_test.go +++ b/libcontainer/stacktrace/frame_test.go @@ -4,8 +4,8 @@ import "testing" func TestParsePackageName(t *testing.T) { var ( - name = "github.com/docker/libcontainer/stacktrace.captureFunc" - expectedPackage = "github.com/docker/libcontainer/stacktrace" + name = "github.com/opencontainers/runc/libcontainer/stacktrace.captureFunc" + expectedPackage = "github.com/opencontainers/runc/libcontainer/stacktrace" expectedFunction = "captureFunc" ) diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go index 445c1fa2..74a32293 100644 --- a/libcontainer/standard_init_linux.go +++ b/libcontainer/standard_init_linux.go @@ -6,10 +6,10 @@ import ( "os" "syscall" - "github.com/docker/libcontainer/apparmor" - "github.com/docker/libcontainer/configs" - "github.com/docker/libcontainer/label" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/apparmor" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/label" + "github.com/opencontainers/runc/libcontainer/system" ) type linuxStandardInit struct { diff --git a/libcontainer/stats_linux.go b/libcontainer/stats_linux.go index 8ce96978..c629dc67 100644 --- a/libcontainer/stats_linux.go +++ b/libcontainer/stats_linux.go @@ -1,6 +1,6 @@ package libcontainer -import "github.com/docker/libcontainer/cgroups" +import "github.com/opencontainers/runc/libcontainer/cgroups" type Stats struct { Interfaces []*NetworkInterface diff --git a/libcontainer/xattr/xattr_linux.go b/libcontainer/xattr/xattr_linux.go index fc08d01f..933a7527 100644 --- a/libcontainer/xattr/xattr_linux.go +++ b/libcontainer/xattr/xattr_linux.go @@ -5,7 +5,7 @@ package xattr import ( "syscall" - "github.com/docker/libcontainer/system" + "github.com/opencontainers/runc/libcontainer/system" ) func XattrEnabled(path string) bool { diff --git a/libcontainer/xattr/xattr_test.go b/libcontainer/xattr/xattr_test.go index d818c691..ed9b2bf5 100644 --- a/libcontainer/xattr/xattr_test.go +++ b/libcontainer/xattr/xattr_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/docker/libcontainer/xattr" + "github.com/opencontainers/runc/libcontainer/xattr" ) func testXattr(t *testing.T) {