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

View File

@ -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!

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
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

View File

@ -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.

View File

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

View File

@ -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 (

View File

@ -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 {

View File

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

View File

@ -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 {

View File

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

View File

@ -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 (

View File

@ -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 {

View File

@ -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 {

View File

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

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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 (

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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"
)

View File

@ -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 {

View File

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

View File

@ -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

View File

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

View File

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

View File

@ -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 (

View File

@ -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) {

View File

@ -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}}

View File

@ -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

View File

@ -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

View File

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

View File

@ -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) {

View File

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

View File

@ -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

View File

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

View File

@ -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 {

View File

@ -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

View File

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

View File

@ -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{

View File

@ -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 {

View File

@ -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) {

View File

@ -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

View File

@ -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": [
{

View File

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

View File

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

View File

@ -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

View File

@ -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 {

View File

@ -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"
)

View File

@ -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 {

View File

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

View File

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

View File

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