Skip to content

Commit

Permalink
Update import paths for new repository
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Crosby <[email protected]>
  • Loading branch information
crosbymichael committed Jun 22, 2015
1 parent 8f97d39 commit 080df7a
Show file tree
Hide file tree
Showing 63 changed files with 114 additions and 114 deletions.
6 changes: 3 additions & 3 deletions libcontainer/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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!
Expand Down
6 changes: 3 additions & 3 deletions libcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/cgroups.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package cgroups
import (
"fmt"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

type Manager interface {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/apply_raw.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/blkio.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/blkio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"testing"

"github.com/docker/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/cpu.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/cpu_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"testing"

"github.com/docker/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups"
)

func TestCpuSetShares(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions libcontainer/cgroups/fs/cpuacct.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/cpuset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/devices.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/devices_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package fs
import (
"testing"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/freezer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/freezer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package fs
import (
"testing"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

func TestFreezerSetState(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/hugetlb.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/hugetlb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/memory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"testing"

"github.com/docker/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/net_cls.go
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/net_prio.go
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/net_prio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/fs/perf_event.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/stats_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/cgroups/fs/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"path/filepath"
"testing"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

type cgroupTestUtil struct {
Expand Down
4 changes: 2 additions & 2 deletions libcontainer/cgroups/systemd/apply_nosystemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions libcontainer/cgroups/systemd/apply_systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/configs/validate/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path/filepath"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

type Validator interface {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/console_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package libcontainer

import (
"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

// The status of a container.
Expand Down
6 changes: 3 additions & 3 deletions libcontainer/container_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions libcontainer/container_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/devices/devices_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"syscall"

"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/devices/devices_windows.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/docs/man/nsinit.1.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% nsinit User Manual
% docker/libcontainer
% opencontainers/runc/libcontainer
% JAN 2015

NAME:
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/factory.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package libcontainer

import (
"github.com/docker/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
)

type Factory interface {
Expand Down
Loading

0 comments on commit 080df7a

Please sign in to comment.