jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update import paths for new repository 

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-06-21 19:29:59 -07:00
parent 8f97d39dd2
commit 080df7ab88
63 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/CONTRIBUTING.md
View File

@ -6,7 +6,7 @@ feels wrong or incomplete.
## Reporting Issues ## 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), 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 output of `uname -a`. Please include the steps required to reproduce
the problem if possible and applicable. 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 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! Like the previous command, you can run this on OSX too!
### Building libcontainer directly ### Building libcontainer directly
@ -98,7 +98,7 @@ else is working on the same thing.
### Create issues... ### Create issues...
Any significant improvement should be documented as [a GitHub 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. starts working on it.
### ...but check for existing issues first! ### ...but check for existing issues first!

6
libcontainer/Dockerfile
View File

@ -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 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 RUN go get github.com/docker/docker/pkg/term
# setup a playground for us to spawn containers in # 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 && \ RUN curl -sSL https://raw.githubusercontent.com/docker/docker/master/hack/dind -o /dind && \
chmod +x /dind chmod +x /dind
COPY . /go/src/github.com/docker/libcontainer COPY . /go/src/github.com/opencontainers/runc/libcontainer
WORKDIR /go/src/github.com/docker/libcontainer WORKDIR /go/src/github.com/opencontainers/runc/libcontainer
RUN cp sample_configs/minimal.json /busybox/container.json RUN cp sample_configs/minimal.json /busybox/container.json
RUN make direct-install RUN make direct-install

2
libcontainer/ROADMAP.md
View File

@ -3,7 +3,7 @@
This document is a high-level overview of where we want to take libcontainer next. 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. 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. To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.

2
libcontainer/cgroups/cgroups.go
View File

@ -5,7 +5,7 @@ package cgroups
import ( import (
"fmt" "fmt"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type Manager interface { type Manager interface {

4
libcontainer/cgroups/fs/apply_raw.go
View File

@ -11,8 +11,8 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
var ( var (

4
libcontainer/cgroups/fs/blkio.go
View File

@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type BlkioGroup struct { type BlkioGroup struct {

2
libcontainer/cgroups/fs/blkio_test.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
) )
const ( const (

4
libcontainer/cgroups/fs/cpu.go
View File

@ -8,8 +8,8 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type CpuGroup struct { type CpuGroup struct {

2
libcontainer/cgroups/fs/cpu_test.go
View File

@ -7,7 +7,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
) )
func TestCpuSetShares(t *testing.T) { func TestCpuSetShares(t *testing.T) {

6
libcontainer/cgroups/fs/cpuacct.go
View File

@ -9,9 +9,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
const ( const (

4
libcontainer/cgroups/fs/cpuset.go
View File

@ -9,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type CpusetGroup struct { type CpusetGroup struct {

4
libcontainer/cgroups/fs/devices.go
View File

@ -3,8 +3,8 @@
package fs package fs
import ( import (
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type DevicesGroup struct { type DevicesGroup struct {

2
libcontainer/cgroups/fs/devices_test.go
View File

@ -5,7 +5,7 @@ package fs
import ( import (
"testing" "testing"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
var ( var (

4
libcontainer/cgroups/fs/freezer.go
View File

@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type FreezerGroup struct { type FreezerGroup struct {

2
libcontainer/cgroups/fs/freezer_test.go
View File

@ -3,7 +3,7 @@ package fs
import ( import (
"testing" "testing"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
func TestFreezerSetState(t *testing.T) { func TestFreezerSetState(t *testing.T) {

4
libcontainer/cgroups/fs/hugetlb.go
View File

@ -7,8 +7,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type HugetlbGroup struct { type HugetlbGroup struct {

4
libcontainer/cgroups/fs/hugetlb_test.go
View File

@ -5,8 +5,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
const ( const (

4
libcontainer/cgroups/fs/memory.go
View File

@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type MemoryGroup struct { type MemoryGroup struct {

2
libcontainer/cgroups/fs/memory_test.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
) )
const ( const (

4
libcontainer/cgroups/fs/net_cls.go
View File

@ -1,8 +1,8 @@
package fs package fs
import ( import (
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type NetClsGroup struct { type NetClsGroup struct {

4
libcontainer/cgroups/fs/net_prio.go
View File

@ -1,8 +1,8 @@
package fs package fs
import ( import (
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type NetPrioGroup struct { type NetPrioGroup struct {

2
libcontainer/cgroups/fs/net_prio_test.go
View File

@ -4,7 +4,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
var ( var (

4
libcontainer/cgroups/fs/perf_event.go
View File

@ -3,8 +3,8 @@
package fs package fs
import ( import (
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type PerfEventGroup struct { type PerfEventGroup struct {

2
libcontainer/cgroups/fs/stats_util_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
) )
func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error { func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error {

2
libcontainer/cgroups/fs/util_test.go
View File

@ -13,7 +13,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type cgroupTestUtil struct { type cgroupTestUtil struct {

4
libcontainer/cgroups/systemd/apply_nosystemd.go
View File

@ -5,8 +5,8 @@ package systemd
import ( import (
"fmt" "fmt"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type Manager struct { type Manager struct {

8
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -13,9 +13,9 @@ import (
"time" "time"
systemd "github.com/coreos/go-systemd/dbus" systemd "github.com/coreos/go-systemd/dbus"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/fs" "github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/godbus/dbus" "github.com/godbus/dbus"
) )
@ -237,7 +237,7 @@ func (m *Manager) Apply(pid int) error {
return err return err
} }
// FIXME: Systemd does have `BlockIODeviceWeight` property, but we got problem // 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. // so use fs work around for now.
if err := joinBlkio(c, pid); err != nil { if err := joinBlkio(c, pid); err != nil {
return err return err

2
libcontainer/configs/validate/config.go
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type Validator interface { type Validator interface {

2
libcontainer/console_linux.go
View File

@ -7,7 +7,7 @@ import (
"syscall" "syscall"
"unsafe" "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 // newConsole returns an initalized console that can be used within a container by copying bytes

2
libcontainer/container.go
View File

@ -5,7 +5,7 @@
package libcontainer package libcontainer
import ( import (
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
// The status of a container. // The status of a container.

6
libcontainer/container_linux.go
View File

@ -14,9 +14,9 @@ import (
"syscall" "syscall"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/criurpc" "github.com/opencontainers/runc/libcontainer/criurpc"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

4
libcontainer/container_linux_test.go
View File

@ -7,8 +7,8 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type mockCgroupManager struct { type mockCgroupManager struct {

2
libcontainer/devices/devices_unix.go
View File

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
var ( var (

2
libcontainer/devices/devices_windows.go
View File

@ -1,7 +1,7 @@
package devices package devices
import ( import (
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
// TODO Windows. This can be factored out further - Devices are not supported // TODO Windows. This can be factored out further - Devices are not supported

2
libcontainer/docs/man/nsinit.1.md
View File

@ -1,5 +1,5 @@
% nsinit User Manual % nsinit User Manual
% docker/libcontainer % opencontainers/runc/libcontainer
% JAN 2015 % JAN 2015
NAME: NAME:

2
libcontainer/factory.go
View File

@ -1,7 +1,7 @@
package libcontainer package libcontainer
import ( import (
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
type Factory interface { type Factory interface {

10
libcontainer/factory_linux.go
View File

@ -14,11 +14,11 @@ import (
"syscall" "syscall"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/fs" "github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/docker/libcontainer/cgroups/systemd" "github.com/opencontainers/runc/libcontainer/cgroups/systemd"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/configs/validate" "github.com/opencontainers/runc/libcontainer/configs/validate"
) )
const ( const (

2
libcontainer/factory_linux_test.go
View File

@ -10,7 +10,7 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
func newTestRoot() (string, error) { func newTestRoot() (string, error) {

2
libcontainer/generic_error.go
View File

@ -6,7 +6,7 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/docker/libcontainer/stacktrace" "github.com/opencontainers/runc/libcontainer/stacktrace"
) )
var errorTemplate = template.Must(template.New("error").Parse(`Timestamp: {{.Timestamp}} var errorTemplate = template.Must(template.New("error").Parse(`Timestamp: {{.Timestamp}}

2
libcontainer/hack/validate.sh
View File

@ -5,7 +5,7 @@ set -e
validate() { validate() {
export MAKEDIR=/go/src/github.com/docker/docker/hack/make 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-dco
bash /go/src/github.com/docker/docker/hack/make/validate-gofmt bash /go/src/github.com/docker/docker/hack/make/validate-gofmt
go get golang.org/x/tools/cmd/vet go get golang.org/x/tools/cmd/vet

14
libcontainer/init_linux.go
View File

@ -10,13 +10,13 @@ import (
"syscall" "syscall"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/netlink" "github.com/opencontainers/runc/libcontainer/netlink"
"github.com/docker/libcontainer/seccomp" "github.com/opencontainers/runc/libcontainer/seccomp"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
"github.com/docker/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
"github.com/docker/libcontainer/utils" "github.com/opencontainers/runc/libcontainer/utils"
) )
type initType string type initType string

2
libcontainer/integration/checkpoint_test.go
View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/libcontainer" "github.com/opencontainers/runc/libcontainer"
) )
func TestCheckpoint(t *testing.T) { func TestCheckpoint(t *testing.T) {

6
libcontainer/integration/exec_test.go
View File

@ -10,9 +10,9 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/docker/libcontainer" "github.com/opencontainers/runc/libcontainer"
"github.com/docker/libcontainer/cgroups/systemd" "github.com/opencontainers/runc/libcontainer/cgroups/systemd"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
func TestExecPS(t *testing.T) { func TestExecPS(t *testing.T) {

2
libcontainer/integration/execin_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/docker/libcontainer" "github.com/opencontainers/runc/libcontainer"
) )
func TestExecIn(t *testing.T) { func TestExecIn(t *testing.T) {

6
libcontainer/integration/init_test.go
View File

@ -6,9 +6,9 @@ import (
"testing" "testing"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libcontainer" "github.com/opencontainers/runc/libcontainer"
"github.com/docker/libcontainer/cgroups/systemd" "github.com/opencontainers/runc/libcontainer/cgroups/systemd"
_ "github.com/docker/libcontainer/nsenter" _ "github.com/opencontainers/runc/libcontainer/nsenter"
) )
// init runs the libcontainer initialization code because of the busybox style needs // init runs the libcontainer initialization code because of the busybox style needs

2
libcontainer/integration/template_test.go
View File

@ -3,7 +3,7 @@ package integration
import ( import (
"syscall" "syscall"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
var standardEnvironment = []string{ var standardEnvironment = []string{

4
libcontainer/integration/utils_test.go
View File

@ -12,8 +12,8 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/docker/libcontainer" "github.com/opencontainers/runc/libcontainer"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
) )
func newStdBuffers() *stdBuffers { func newStdBuffers() *stdBuffers {

2
libcontainer/label/label_selinux.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/libcontainer/selinux" "github.com/opencontainers/runc/libcontainer/selinux"
) )
// InitLabels returns the process label and file labels to be used within // InitLabels returns the process label and file labels to be used within

2
libcontainer/label/label_selinux_test.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/libcontainer/selinux" "github.com/opencontainers/runc/libcontainer/selinux"
) )
func TestInit(t *testing.T) { func TestInit(t *testing.T) {

6
libcontainer/network_linux.go
View File

@ -10,9 +10,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/netlink" "github.com/opencontainers/runc/libcontainer/netlink"
"github.com/docker/libcontainer/utils" "github.com/opencontainers/runc/libcontainer/utils"
) )
var strategies = map[string]networkStrategy{ var strategies = map[string]networkStrategy{

4
libcontainer/process_linux.go
View File

@ -12,8 +12,8 @@ import (
"strconv" "strconv"
"syscall" "syscall"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
type parentProcess interface { type parentProcess interface {

2
libcontainer/restored_process.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
func newRestoredProcess(pid int, fds []string) (*restoredProcess, error) { func newRestoredProcess(pid int, fds []string) (*restoredProcess, error) {

6
libcontainer/rootfs_linux.go
View File

@ -14,9 +14,9 @@ import (
"time" "time"
"github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/symlink"
"github.com/docker/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
) )
const defaultMountFlags = syscall.MS_NOEXEC | syscall.MS_NOSUID | syscall.MS_NODEV const defaultMountFlags = syscall.MS_NOEXEC | syscall.MS_NOSUID | syscall.MS_NODEV

2
libcontainer/sample_configs/minimal.json
View File

@ -2,7 +2,7 @@
"no_pivot_root": false, "no_pivot_root": false,
"parent_death_signal": 0, "parent_death_signal": 0,
"pivot_dir": "", "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, "readonlyfs": false,
"mounts": [ "mounts": [
{ {

2
libcontainer/selinux/selinux.go
View File

@ -16,7 +16,7 @@ import (
"syscall" "syscall"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
const ( const (

2
libcontainer/selinux/selinux_test.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/libcontainer/selinux" "github.com/opencontainers/runc/libcontainer/selinux"
) )
func testSetfilecon(t *testing.T) { func testSetfilecon(t *testing.T) {

6
libcontainer/setns_init_linux.go
View File

@ -5,9 +5,9 @@ package libcontainer
import ( import (
"os" "os"
"github.com/docker/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/docker/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
// linuxSetnsInit performs the container's initialization for running a new process // linuxSetnsInit performs the container's initialization for running a new process

2
libcontainer/stacktrace/capture_test.go
View File

@ -18,7 +18,7 @@ func TestCaptureTestFunc(t *testing.T) {
if expected := "captureFunc"; frame.Function != expected { if expected := "captureFunc"; frame.Function != expected {
t.Fatalf("expteced function %q but recevied %q", expected, frame.Function) 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) t.Fatalf("expected package %q but received %q", expected, frame.Package)
} }
if expected := "capture_test.go"; frame.File != expected { if expected := "capture_test.go"; frame.File != expected {

4
libcontainer/stacktrace/frame_test.go
View File

@ -4,8 +4,8 @@ import "testing"
func TestParsePackageName(t *testing.T) { func TestParsePackageName(t *testing.T) {
var ( var (
name = "github.com/docker/libcontainer/stacktrace.captureFunc" name = "github.com/opencontainers/runc/libcontainer/stacktrace.captureFunc"
expectedPackage = "github.com/docker/libcontainer/stacktrace" expectedPackage = "github.com/opencontainers/runc/libcontainer/stacktrace"
expectedFunction = "captureFunc" expectedFunction = "captureFunc"
) )

8
libcontainer/standard_init_linux.go
View File

@ -6,10 +6,10 @@ import (
"os" "os"
"syscall" "syscall"
"github.com/docker/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/docker/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/docker/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
type linuxStandardInit struct { type linuxStandardInit struct {

2
libcontainer/stats_linux.go
View File

@ -1,6 +1,6 @@
package libcontainer package libcontainer
import "github.com/docker/libcontainer/cgroups" import "github.com/opencontainers/runc/libcontainer/cgroups"
type Stats struct { type Stats struct {
Interfaces []*NetworkInterface Interfaces []*NetworkInterface

2
libcontainer/xattr/xattr_linux.go
View File

@ -5,7 +5,7 @@ package xattr
import ( import (
"syscall" "syscall"
"github.com/docker/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
) )
func XattrEnabled(path string) bool { func XattrEnabled(path string) bool {

2
libcontainer/xattr/xattr_test.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/libcontainer/xattr" "github.com/opencontainers/runc/libcontainer/xattr"
) )
func testXattr(t *testing.T) { func testXattr(t *testing.T) {