diff --git a/.travis.yml b/.travis.yml index c8ed215..c2f91b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ go: - 1.8.x - tip -go_import_path: github.com/docker/containerd +go_import_path: github.com/containerd/containerd addons: apt: diff --git a/MAINTAINERS b/MAINTAINERS index 3a6fda8..66ba86d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,7 +163,7 @@ of the pull request and which areas of the project it affects. text = """ The [DCO or `Sign your work`]( -https://github.com/docker/containerd/blob/master/CONTRIBUTING.md#sign-your-work) +https://github.com/containerd/containerd/blob/master/CONTRIBUTING.md#sign-your-work) requirement is not intended as a roadblock or speed bump. Some containerd contributors are not as familiar with `git`, or have used a web diff --git a/Makefile b/Makefile index a99afca..db1eade 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DESTDIR=/usr/local # Used to populate version variable in main package. VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always) -PKG=github.com/docker/containerd +PKG=github.com/containerd/containerd # Project packages. PACKAGES=$(shell go list ./... | grep -v /vendor/) diff --git a/README.md b/README.md index b6c4a63..e96ece4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![banner](/docs/images/containerd-dark.png?raw=true) -[![Build Status](https://travis-ci.org/docker/containerd.svg?branch=master)](https://travis-ci.org/docker/containerd) +[![Build Status](https://travis-ci.org/containerd/containerd.svg?branch=master)](https://travis-ci.org/containerd/containerd) containerd is an industry-standard container runtime with an emphasis on simplicity, robustness and portability. It is available as a daemon for Linux and Windows, which can manage the complete container lifecycle of its host system: image transfer and storage, container execution and supervision, low-level storage and network attachments, etc.. @@ -9,7 +9,7 @@ containerd is designed to be embedded into a larger system, rather than being us ### State of the Project containerd currently has two active branches. -There is a [v0.2.x](https://github.com/docker/containerd/tree/v0.2.x) branch for the current release of containerd that is being consumed by Docker and others and the master branch is the development branch for the 1.0 roadmap and feature set. +There is a [v0.2.x](https://github.com/containerd/containerd/tree/v0.2.x) branch for the current release of containerd that is being consumed by Docker and others and the master branch is the development branch for the 1.0 roadmap and feature set. Any PR or issue that is intended for the current v0.2.x release should be tagged with the same `v0.2.x` tag. ### Communication @@ -124,7 +124,7 @@ For the scope of this project to change it requires a 100% vote from all maintai ### Development reports. Weekly summary on the progress and what is being worked on. -https://github.com/docker/containerd/tree/master/reports +https://github.com/containerd/containerd/tree/master/reports ## Copyright and license diff --git a/ROADMAP.md b/ROADMAP.md index fbd5320..3f062f3 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -2,7 +2,7 @@ This is a high level roadmap for the project that outlines what is currently being worked on, what comes next, and where you can help. -For a more up to date look please review the milestones on [github](https://github.com/docker/containerd/milestones). +For a more up to date look please review the milestones on [github](https://github.com/containerd/containerd/milestones). The following are the different status the various phases of development can be in: * Not Started - no work or thinking has been done towards the goal @@ -52,7 +52,7 @@ The runtime layer is responsible for the creation of containers and their manage ### Storage -**Documents:** https://github.com/docker/containerd/blob/master/design/snapshots.md +**Documents:** https://github.com/containerd/containerd/blob/master/design/snapshots.md The current graph drivers were built when we only had overlay filesystems like aufs. We forced the model to be designed around overlay filesystems and this introduced a lot of complexity for snapshotting graph drivers like btrfs and devicemapper thin-p. diff --git a/api/services/content/content.pb.go b/api/services/content/content.pb.go index 0dd41e4..d42341c 100644 --- a/api/services/content/content.pb.go +++ b/api/services/content/content.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/services/content/content.proto +// source: github.com/containerd/containerd/api/services/content/content.proto // DO NOT EDIT! /* Package content is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/services/content/content.proto + github.com/containerd/containerd/api/services/content/content.proto It has these top-level messages: InfoRequest @@ -632,7 +632,7 @@ var _Content_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "github.com/docker/containerd/api/services/content/content.proto", + Metadata: "github.com/containerd/containerd/api/services/content/content.proto", } func (m *InfoRequest) Marshal() (dAtA []byte, err error) { @@ -2583,58 +2583,57 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/services/content/content.proto", fileDescriptorContent) + proto.RegisterFile("github.com/containerd/containerd/api/services/content/content.proto", fileDescriptorContent) } var fileDescriptorContent = []byte{ - // 777 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcf, 0x4f, 0xdb, 0x48, - 0x14, 0xce, 0xe4, 0x87, 0x97, 0xbc, 0x04, 0x36, 0x3b, 0x64, 0x51, 0x64, 0xc0, 0xc9, 0x66, 0x2f, - 0x11, 0xd2, 0xda, 0x6c, 0xf6, 0xb6, 0x7b, 0x40, 0x4e, 0x60, 0x11, 0x2b, 0xb1, 0x48, 0x26, 0x12, - 0xea, 0xa9, 0x72, 0xe2, 0x49, 0x6a, 0x95, 0x64, 0x5c, 0x7b, 0x82, 0x68, 0x4f, 0xbd, 0x54, 0xaa, - 0x38, 0xf5, 0x1f, 0xe0, 0xd4, 0xde, 0x7b, 0xac, 0xd4, 0x7f, 0xa0, 0x1c, 0x7b, 0xac, 0x38, 0xd0, - 0x12, 0xa9, 0xfd, 0x37, 0x5a, 0x79, 0x3c, 0x4e, 0x9c, 0x1f, 0x3d, 0x90, 0x42, 0x2e, 0x9e, 0xf1, - 0x7b, 0xef, 0xd3, 0xfb, 0xbe, 0xf7, 0xe5, 0x19, 0xb6, 0x3a, 0x36, 0x7b, 0xd0, 0x6f, 0xaa, 0x2d, - 0xda, 0xd5, 0x2c, 0xda, 0x7a, 0x48, 0x5c, 0xad, 0x45, 0x7b, 0xcc, 0xb4, 0x7b, 0xc4, 0xb5, 0x34, - 0xd3, 0xb1, 0x35, 0x8f, 0xb8, 0x27, 0x76, 0x8b, 0x78, 0xfc, 0x3d, 0xe9, 0xb1, 0xf0, 0xa9, 0x3a, - 0x2e, 0x65, 0x14, 0x2f, 0x8e, 0xd2, 0xd5, 0x93, 0x3f, 0xe5, 0x7c, 0x87, 0x76, 0x28, 0x8f, 0x68, - 0xfe, 0x29, 0x48, 0x92, 0x8b, 0x1d, 0x4a, 0x3b, 0xc7, 0x44, 0xe3, 0xb7, 0x66, 0xbf, 0xad, 0x31, - 0xbb, 0x4b, 0x3c, 0x66, 0x76, 0x1d, 0x91, 0xb0, 0x3a, 0x99, 0x40, 0xba, 0x0e, 0x7b, 0x1c, 0x04, - 0xcb, 0xf7, 0x20, 0xb3, 0xd7, 0x6b, 0x53, 0x83, 0x3c, 0xea, 0x13, 0x8f, 0xe1, 0xff, 0x40, 0xb2, - 0xec, 0x0e, 0xf1, 0x58, 0x01, 0x95, 0x50, 0x25, 0x5d, 0xab, 0x5e, 0x5c, 0x15, 0x63, 0x97, 0x57, - 0xc5, 0x8d, 0x08, 0x15, 0xea, 0x90, 0xde, 0xb0, 0x31, 0x4f, 0xeb, 0xd0, 0x3f, 0x82, 0x12, 0x75, - 0x9b, 0x3f, 0x0c, 0x81, 0x50, 0x7e, 0x83, 0x20, 0x1b, 0x60, 0x7b, 0x0e, 0xed, 0x79, 0xe4, 0x36, - 0xc1, 0x31, 0x86, 0xa4, 0x67, 0x3f, 0x21, 0x85, 0x78, 0x09, 0x55, 0x12, 0x06, 0x3f, 0xe3, 0x5d, - 0xc8, 0xb6, 0x68, 0xb7, 0x6b, 0x33, 0x46, 0xac, 0xfb, 0x26, 0x2b, 0x24, 0x4a, 0xa8, 0x92, 0xa9, - 0xca, 0x6a, 0xc0, 0x5f, 0x0d, 0xf9, 0xab, 0x8d, 0x50, 0xa0, 0xda, 0x82, 0xdf, 0xc1, 0x8b, 0x8f, - 0x45, 0x64, 0x64, 0x86, 0x95, 0x3a, 0x2b, 0x37, 0x21, 0xbf, 0x4d, 0x8e, 0x09, 0x23, 0xf5, 0x60, - 0x1c, 0x77, 0xa1, 0xce, 0x33, 0x04, 0x19, 0x83, 0x98, 0xd6, 0x1d, 0x60, 0xe3, 0x15, 0x90, 0x68, - 0xbb, 0xed, 0x11, 0x26, 0xe4, 0x11, 0xb7, 0xa1, 0x68, 0x89, 0x91, 0x68, 0xe5, 0xbf, 0x21, 0x1b, - 0xb4, 0x21, 0x86, 0x34, 0xaa, 0x45, 0x93, 0xb5, 0x96, 0xc9, 0x4c, 0x8e, 0x98, 0x35, 0xf8, 0xb9, - 0xfc, 0x05, 0x41, 0xf6, 0xc8, 0xb5, 0x19, 0x09, 0x49, 0x54, 0x41, 0x32, 0x5b, 0xcc, 0xa6, 0x3d, - 0x5e, 0xbc, 0x54, 0x95, 0xd5, 0x31, 0x07, 0xab, 0x3c, 0x59, 0xe7, 0x19, 0x86, 0xc8, 0xc4, 0x39, - 0x48, 0xb8, 0xa4, 0xcd, 0x71, 0xd3, 0x86, 0x7f, 0xc4, 0x79, 0x48, 0x31, 0xca, 0xcc, 0x63, 0xd1, - 0x67, 0x70, 0xc1, 0xff, 0xc3, 0x02, 0x39, 0x75, 0x48, 0x8b, 0x11, 0xab, 0x90, 0x9c, 0x5b, 0xa2, - 0x21, 0x46, 0x84, 0x68, 0x6a, 0x26, 0x51, 0x29, 0x42, 0xf4, 0x5d, 0x1c, 0x16, 0x05, 0x51, 0x21, - 0xd3, 0x3c, 0x4c, 0xeb, 0x00, 0x1e, 0x33, 0x5d, 0xe1, 0xce, 0xf8, 0x0d, 0xdc, 0x99, 0x16, 0x75, - 0x3a, 0xf3, 0x41, 0xfa, 0x8e, 0x65, 0xce, 0x61, 0xf1, 0xb4, 0xa8, 0xd3, 0xa3, 0x06, 0x49, 0x8e, - 0x71, 0x1f, 0x2a, 0x9f, 0x8a, 0x2a, 0x3f, 0xb2, 0xa6, 0xf4, 0xc3, 0xb6, 0xff, 0x07, 0x16, 0x0f, - 0x99, 0xc9, 0xfa, 0x5e, 0x68, 0x19, 0x0c, 0x49, 0x97, 0xb4, 0xbd, 0x02, 0x2a, 0x25, 0x2a, 0x69, - 0x83, 0x9f, 0xfd, 0xf6, 0x1c, 0x97, 0xb4, 0xed, 0xd3, 0x42, 0x9c, 0xbf, 0x15, 0xb7, 0xf2, 0x25, - 0x82, 0xa5, 0xb0, 0x5a, 0xcc, 0x61, 0x5c, 0x53, 0x74, 0x1b, 0x9a, 0xc6, 0xe7, 0xd3, 0x54, 0xf8, - 0x38, 0x31, 0xf2, 0xf1, 0x8d, 0x54, 0xde, 0x78, 0x8d, 0x20, 0x13, 0x71, 0x0d, 0x5e, 0x87, 0xe4, - 0x61, 0x43, 0x6f, 0xe4, 0x62, 0xf2, 0xf2, 0xd9, 0x79, 0xe9, 0xe7, 0x48, 0xc8, 0x97, 0x00, 0x17, - 0x21, 0x75, 0x64, 0xec, 0x35, 0x76, 0x72, 0x48, 0xce, 0x9f, 0x9d, 0x97, 0x72, 0x91, 0x38, 0x3f, - 0xe2, 0xdf, 0x40, 0xaa, 0x1f, 0xec, 0xef, 0xef, 0x35, 0x72, 0x71, 0xf9, 0xd7, 0xb3, 0xf3, 0xd2, - 0x2f, 0x91, 0x8c, 0x3a, 0x5f, 0x76, 0xb8, 0x02, 0x29, 0xbd, 0x76, 0x60, 0x34, 0x72, 0x5f, 0xc3, - 0xdf, 0x34, 0x98, 0xde, 0xa4, 0x2e, 0x93, 0x97, 0x9f, 0xbf, 0x54, 0x62, 0x6f, 0x5f, 0x29, 0xd1, - 0x0e, 0xab, 0x9f, 0xe3, 0xf0, 0x93, 0xd8, 0x90, 0x78, 0x0b, 0x92, 0xfe, 0xae, 0xc7, 0x93, 0xff, - 0x83, 0xc8, 0xc7, 0x45, 0x5e, 0x9d, 0x19, 0x13, 0x83, 0xdc, 0x01, 0x29, 0xd8, 0xb9, 0xf8, 0xf7, - 0x89, 0xb4, 0x59, 0xab, 0x58, 0x5e, 0x99, 0x1a, 0xcf, 0x8e, 0xff, 0x55, 0xc3, 0x3a, 0x24, 0xfd, - 0x75, 0x36, 0xd5, 0x47, 0x64, 0xd5, 0x4e, 0xf5, 0x11, 0xdd, 0x7f, 0x9b, 0x08, 0xef, 0x82, 0x14, - 0x98, 0x0c, 0xaf, 0x4d, 0x24, 0x8e, 0x39, 0x57, 0x5e, 0xff, 0x4e, 0x74, 0x08, 0xf4, 0x2f, 0xa4, - 0x82, 0x51, 0xac, 0xce, 0x5a, 0x0e, 0x21, 0xcc, 0xda, 0xec, 0x60, 0x80, 0x52, 0x41, 0x9b, 0xa8, - 0x56, 0xb8, 0xb8, 0x56, 0x62, 0x1f, 0xae, 0x95, 0xd8, 0xd3, 0x81, 0x82, 0x2e, 0x06, 0x0a, 0x7a, - 0x3f, 0x50, 0xd0, 0xa7, 0x81, 0x82, 0x9a, 0x12, 0x67, 0xff, 0xd7, 0xb7, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xbb, 0x95, 0xf8, 0xe3, 0x6a, 0x08, 0x00, 0x00, + // 768 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0xd3, 0x4e, + 0x10, 0xcd, 0xe6, 0x8f, 0x7f, 0xcd, 0x24, 0xed, 0x2f, 0x6c, 0x43, 0x15, 0xb9, 0xad, 0x13, 0xc2, + 0x25, 0xaa, 0x84, 0x53, 0xc2, 0x0d, 0x0e, 0xc8, 0x49, 0x4b, 0x55, 0xa4, 0x52, 0xc9, 0x8d, 0x54, + 0x71, 0x42, 0x4e, 0xb2, 0x09, 0x96, 0x1a, 0xaf, 0xb1, 0x37, 0x55, 0xe1, 0xc4, 0x05, 0x09, 0xf5, + 0xc4, 0x17, 0xe8, 0x09, 0xee, 0x1c, 0x91, 0xf8, 0x02, 0xf4, 0xc8, 0x11, 0xf5, 0x50, 0x68, 0x24, + 0xf8, 0x1a, 0x20, 0xaf, 0xd7, 0x89, 0xf3, 0x87, 0x43, 0x43, 0x9b, 0x8b, 0x67, 0x3d, 0x33, 0x4f, + 0xf3, 0xde, 0xbe, 0x8c, 0xa1, 0xd6, 0x31, 0xd9, 0xf3, 0x5e, 0x43, 0x6d, 0xd2, 0x6e, 0xb9, 0x49, + 0x2d, 0x66, 0x98, 0x16, 0x71, 0x5a, 0xe1, 0xd0, 0xb0, 0xcd, 0xb2, 0x4b, 0x9c, 0x43, 0xb3, 0x49, + 0x5c, 0xfe, 0x9e, 0x58, 0x2c, 0x78, 0xaa, 0xb6, 0x43, 0x19, 0xc5, 0xf3, 0xc3, 0x72, 0xf5, 0xf0, + 0xae, 0x9c, 0xed, 0xd0, 0x0e, 0xe5, 0x99, 0xb2, 0x17, 0xf9, 0x45, 0x72, 0xbe, 0x43, 0x69, 0xe7, + 0x80, 0x94, 0xf9, 0xa9, 0xd1, 0x6b, 0x97, 0x99, 0xd9, 0x25, 0x2e, 0x33, 0xba, 0xb6, 0x28, 0x58, + 0x1e, 0x2f, 0x20, 0x5d, 0x9b, 0xbd, 0xf4, 0x93, 0xc5, 0xa7, 0x90, 0xda, 0xb6, 0xda, 0x54, 0x27, + 0x2f, 0x7a, 0xc4, 0x65, 0xf8, 0x31, 0x48, 0x2d, 0xb3, 0x43, 0x5c, 0x96, 0x43, 0x05, 0x54, 0x4a, + 0x56, 0x2b, 0xa7, 0xe7, 0xf9, 0xc8, 0xd9, 0x79, 0x7e, 0x2d, 0x44, 0x87, 0xda, 0xc4, 0x1a, 0x0c, + 0xe6, 0x96, 0x3b, 0xf4, 0x8e, 0xdf, 0xa2, 0x6e, 0xf0, 0x87, 0x2e, 0x10, 0x8a, 0x9f, 0x10, 0xa4, + 0x7d, 0x6c, 0xd7, 0xa6, 0x96, 0x4b, 0xae, 0x12, 0x1c, 0x63, 0x88, 0xbb, 0xe6, 0x2b, 0x92, 0x8b, + 0x16, 0x50, 0x29, 0xa6, 0xf3, 0x18, 0x6f, 0x41, 0xba, 0x49, 0xbb, 0x5d, 0x93, 0x31, 0xd2, 0x7a, + 0x66, 0xb0, 0x5c, 0xac, 0x80, 0x4a, 0xa9, 0x8a, 0xac, 0xfa, 0xfc, 0xd5, 0x80, 0xbf, 0x5a, 0x0f, + 0x04, 0xaa, 0xce, 0x79, 0x13, 0xbc, 0xfb, 0x9e, 0x47, 0x7a, 0x6a, 0xd0, 0xa9, 0xb1, 0x62, 0x03, + 0xb2, 0x1b, 0xe4, 0x80, 0x30, 0x52, 0xf3, 0xaf, 0xe3, 0x3a, 0xd4, 0x79, 0x83, 0x20, 0xa5, 0x13, + 0xa3, 0x75, 0x0d, 0xd8, 0x78, 0x09, 0x24, 0xda, 0x6e, 0xbb, 0x84, 0x09, 0x79, 0xc4, 0x69, 0x20, + 0x5a, 0x6c, 0x28, 0x5a, 0xf1, 0x3e, 0xa4, 0xfd, 0x31, 0xc4, 0x25, 0x0d, 0x7b, 0xd1, 0x78, 0x6f, + 0xcb, 0x60, 0x06, 0x47, 0x4c, 0xeb, 0x3c, 0x2e, 0xfe, 0x42, 0x90, 0xde, 0x77, 0x4c, 0x46, 0x02, + 0x12, 0x15, 0x90, 0x8c, 0x26, 0x33, 0xa9, 0xc5, 0x9b, 0x17, 0x2a, 0xb2, 0x3a, 0xe2, 0x60, 0x95, + 0x17, 0x6b, 0xbc, 0x42, 0x17, 0x95, 0x38, 0x03, 0x31, 0x87, 0xb4, 0x39, 0x6e, 0x52, 0xf7, 0x42, + 0x9c, 0x85, 0x04, 0xa3, 0xcc, 0x38, 0x10, 0x73, 0xfa, 0x07, 0xfc, 0x04, 0xe6, 0xc8, 0x91, 0x4d, + 0x9a, 0x8c, 0xb4, 0x72, 0xf1, 0x99, 0x25, 0x1a, 0x60, 0x84, 0x88, 0x26, 0xa6, 0x12, 0x95, 0x42, + 0x44, 0xbf, 0x44, 0x61, 0x5e, 0x10, 0x15, 0x32, 0xcd, 0xc2, 0xb4, 0x06, 0xe0, 0x32, 0xc3, 0x11, + 0xee, 0x8c, 0x5e, 0xc2, 0x9d, 0x49, 0xd1, 0xa7, 0x31, 0x0f, 0xa4, 0x67, 0xb7, 0x8c, 0x19, 0x2c, + 0x9e, 0x14, 0x7d, 0x5a, 0xd8, 0x20, 0xf1, 0x11, 0xee, 0x03, 0xe5, 0x13, 0x61, 0xe5, 0x87, 0xd6, + 0x94, 0xfe, 0xd9, 0xf6, 0x0f, 0x60, 0x7e, 0x8f, 0x19, 0xac, 0xe7, 0x06, 0x96, 0xc1, 0x10, 0x77, + 0x48, 0xdb, 0xcd, 0xa1, 0x42, 0xac, 0x94, 0xd4, 0x79, 0xec, 0x8d, 0x67, 0x3b, 0xa4, 0x6d, 0x1e, + 0xe5, 0xa2, 0xfc, 0xad, 0x38, 0x15, 0xcf, 0x10, 0x2c, 0x04, 0xdd, 0xe2, 0x1e, 0x46, 0x35, 0x45, + 0x57, 0xa1, 0x69, 0x74, 0x36, 0x4d, 0x85, 0x8f, 0x63, 0x43, 0x1f, 0x5f, 0x4a, 0xe5, 0xb5, 0x8f, + 0x08, 0x52, 0x21, 0xd7, 0xe0, 0x55, 0x88, 0xef, 0xd5, 0xb5, 0x7a, 0x26, 0x22, 0x2f, 0x1e, 0x9f, + 0x14, 0xfe, 0x0f, 0xa5, 0x3c, 0x09, 0x70, 0x1e, 0x12, 0xfb, 0xfa, 0x76, 0x7d, 0x33, 0x83, 0xe4, + 0xec, 0xf1, 0x49, 0x21, 0x13, 0xca, 0xf3, 0x10, 0xdf, 0x02, 0xa9, 0xb6, 0xbb, 0xb3, 0xb3, 0x5d, + 0xcf, 0x44, 0xe5, 0x9b, 0xc7, 0x27, 0x85, 0x1b, 0xa1, 0x8a, 0x1a, 0x5f, 0x76, 0xb8, 0x04, 0x09, + 0xad, 0xba, 0xab, 0xd7, 0x33, 0xbf, 0x83, 0xdf, 0x24, 0x98, 0xd6, 0xa0, 0x0e, 0x93, 0x17, 0xdf, + 0xbe, 0x57, 0x22, 0x9f, 0x3f, 0x28, 0xe1, 0x09, 0x2b, 0x3f, 0xa3, 0xf0, 0x9f, 0xd8, 0x90, 0xf8, + 0x21, 0xc4, 0xbd, 0x5d, 0x8f, 0xc7, 0xff, 0x07, 0xa1, 0x8f, 0x8b, 0xbc, 0x3c, 0x35, 0x27, 0x2e, + 0x72, 0x13, 0x24, 0x7f, 0xe7, 0xe2, 0xdb, 0x63, 0x65, 0xd3, 0x56, 0xb1, 0xbc, 0x34, 0x71, 0x3d, + 0x9b, 0xde, 0x57, 0x0d, 0x6b, 0x10, 0xf7, 0xd6, 0xd9, 0xc4, 0x1c, 0xa1, 0x55, 0x3b, 0x31, 0x47, + 0x78, 0xff, 0xad, 0x23, 0xbc, 0x05, 0x92, 0x6f, 0x32, 0xbc, 0x32, 0x56, 0x38, 0xe2, 0x5c, 0x79, + 0xf5, 0x2f, 0xd9, 0x01, 0xd0, 0x23, 0x48, 0xf8, 0x57, 0xb1, 0x3c, 0x6d, 0x39, 0x04, 0x30, 0x2b, + 0xd3, 0x93, 0x3e, 0x4a, 0x09, 0xad, 0xa3, 0x6a, 0xee, 0xf4, 0x42, 0x89, 0x7c, 0xbb, 0x50, 0x22, + 0xaf, 0xfb, 0x0a, 0x3a, 0xed, 0x2b, 0xe8, 0x6b, 0x5f, 0x41, 0x3f, 0xfa, 0x0a, 0x6a, 0x48, 0x9c, + 0xfd, 0xbd, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x71, 0x48, 0x92, 0x10, 0x6e, 0x08, 0x00, 0x00, } diff --git a/api/services/execution/execution.pb.go b/api/services/execution/execution.pb.go index 5f24909..a8801c4 100644 --- a/api/services/execution/execution.pb.go +++ b/api/services/execution/execution.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/services/execution/execution.proto +// source: github.com/containerd/containerd/api/services/execution/execution.proto // DO NOT EDIT! /* Package execution is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/services/execution/execution.proto + github.com/containerd/containerd/api/services/execution/execution.proto It has these top-level messages: CreateRequest @@ -27,8 +27,8 @@ import math "math" import google_protobuf "github.com/golang/protobuf/ptypes/empty" import google_protobuf1 "github.com/gogo/protobuf/types" import _ "github.com/gogo/protobuf/gogoproto" -import containerd_v1_types "github.com/docker/containerd/api/types/mount" -import containerd_v1_types1 "github.com/docker/containerd/api/types/container" +import containerd_v1_types "github.com/containerd/containerd/api/types/mount" +import containerd_v1_types1 "github.com/containerd/containerd/api/types/container" import ( context "golang.org/x/net/context" @@ -404,7 +404,7 @@ var _ContainerService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "github.com/docker/containerd/api/services/execution/execution.proto", + Metadata: "github.com/containerd/containerd/api/services/execution/execution.proto", } func (m *CreateRequest) Marshal() (dAtA []byte, err error) { @@ -1946,46 +1946,46 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/services/execution/execution.proto", fileDescriptorExecution) + proto.RegisterFile("github.com/containerd/containerd/api/services/execution/execution.proto", fileDescriptorExecution) } var fileDescriptorExecution = []byte{ - // 590 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0x93, 0xd4, 0x2d, 0x93, 0xa6, 0x54, 0xab, 0x2a, 0x32, 0x46, 0x72, 0x23, 0xd3, 0x96, - 0x9c, 0x6c, 0x08, 0x17, 0xc4, 0x01, 0x41, 0xd3, 0x1c, 0x22, 0x28, 0x12, 0xce, 0x81, 0x23, 0x72, - 0xec, 0x4d, 0x58, 0x91, 0xec, 0x9a, 0xdd, 0x75, 0xd4, 0xdc, 0xe0, 0xdf, 0xf5, 0xc8, 0x91, 0x13, - 0xa2, 0xf9, 0x19, 0x9c, 0x90, 0xd7, 0x76, 0x3e, 0x4a, 0x8c, 0xb9, 0x58, 0x33, 0xcf, 0x6f, 0xbc, - 0x6f, 0xde, 0xf3, 0x42, 0x77, 0x4c, 0xe4, 0xa7, 0x78, 0xe8, 0x04, 0x6c, 0xea, 0x86, 0x2c, 0xf8, - 0x8c, 0xb9, 0x1b, 0x30, 0x2a, 0x7d, 0x42, 0x31, 0x0f, 0x5d, 0x3f, 0x22, 0xae, 0xc0, 0x7c, 0x46, - 0x02, 0x2c, 0x5c, 0x7c, 0x8d, 0x83, 0x58, 0x12, 0x46, 0x57, 0x95, 0x13, 0x71, 0x26, 0x19, 0x6a, - 0xae, 0x46, 0x9c, 0xd9, 0x53, 0x27, 0x9f, 0x30, 0x1f, 0x8e, 0x19, 0x1b, 0x4f, 0xb0, 0xab, 0x58, - 0xc3, 0x78, 0xe4, 0xe2, 0x69, 0x24, 0xe7, 0xe9, 0x90, 0xf9, 0xe0, 0xee, 0x4b, 0x9f, 0xe6, 0xaf, - 0x8e, 0xc7, 0x6c, 0xcc, 0x54, 0xe9, 0x26, 0x55, 0x86, 0x3e, 0x2f, 0x95, 0x2a, 0xe7, 0x11, 0x16, - 0xee, 0x94, 0xc5, 0x54, 0xa6, 0xcf, 0x6c, 0xf2, 0xd5, 0x7f, 0x4e, 0x2e, 0xc1, 0x55, 0x95, 0x7e, - 0xc1, 0xfe, 0x56, 0x81, 0x46, 0x97, 0x63, 0x5f, 0x62, 0x0f, 0x7f, 0x89, 0xb1, 0x90, 0xa8, 0x09, - 0x15, 0x12, 0x1a, 0x5a, 0x4b, 0x6b, 0xdf, 0xbb, 0xd0, 0x17, 0x3f, 0x4f, 0x2a, 0xfd, 0x4b, 0xaf, - 0x42, 0x42, 0xd4, 0x86, 0x9a, 0x88, 0x70, 0x60, 0x54, 0x5a, 0x5a, 0xbb, 0xde, 0x39, 0x76, 0xd2, - 0x2d, 0x9d, 0x7c, 0x4b, 0xe7, 0x35, 0x9d, 0x7b, 0x8a, 0x81, 0x3a, 0xa0, 0x73, 0xc6, 0xe4, 0x48, - 0x18, 0xd5, 0x56, 0xb5, 0x5d, 0xef, 0x98, 0xce, 0xa6, 0x8d, 0x4a, 0x93, 0x73, 0x95, 0xec, 0xe1, - 0x65, 0x4c, 0x64, 0xc0, 0x1e, 0x8f, 0xa9, 0x24, 0x53, 0x6c, 0xd4, 0x92, 0xa3, 0xbd, 0xbc, 0x45, - 0xc7, 0xb0, 0x2b, 0x64, 0x48, 0xa8, 0xb1, 0xab, 0xf0, 0xb4, 0x41, 0x4d, 0xd0, 0x85, 0x0c, 0x59, - 0x2c, 0x0d, 0x5d, 0xc1, 0x59, 0x97, 0xe1, 0x98, 0x73, 0x63, 0x6f, 0x89, 0x63, 0xce, 0x91, 0x09, - 0xfb, 0x12, 0xf3, 0x29, 0xa1, 0xfe, 0xc4, 0xd8, 0x6f, 0x69, 0xed, 0x7d, 0x6f, 0xd9, 0xdb, 0x2f, - 0xe0, 0x30, 0xb7, 0x40, 0x44, 0x8c, 0x0a, 0x5c, 0xe8, 0xc1, 0x11, 0x54, 0x23, 0x12, 0x2a, 0x0b, - 0x1a, 0x5e, 0x52, 0xda, 0xe7, 0x70, 0x30, 0x90, 0x3e, 0x97, 0x25, 0xee, 0xd9, 0x8f, 0xa1, 0x71, - 0x89, 0x27, 0xb8, 0xd4, 0x66, 0xbb, 0x0f, 0x87, 0x39, 0xb1, 0x44, 0xcc, 0x09, 0xd4, 0xf1, 0x35, - 0x91, 0x1f, 0x85, 0xf4, 0x65, 0x2c, 0x32, 0x51, 0x90, 0x40, 0x03, 0x85, 0xd8, 0x67, 0x50, 0xef, - 0xd3, 0x11, 0x2b, 0x3b, 0xb1, 0x01, 0xf5, 0xb7, 0x44, 0xe4, 0x1b, 0xd8, 0xef, 0xe0, 0x20, 0x6d, - 0xb3, 0xe3, 0x5f, 0x02, 0x2c, 0xe3, 0x13, 0x86, 0xa6, 0x12, 0xb5, 0xb6, 0x26, 0xda, 0xcd, 0x31, - 0x6f, 0x6d, 0xc2, 0xbe, 0x0f, 0x8d, 0xde, 0x0c, 0x53, 0x29, 0xb2, 0x03, 0x3a, 0xbf, 0xab, 0x70, - 0xb4, 0xa4, 0x0e, 0xd2, 0x2b, 0x85, 0x3e, 0x80, 0x9e, 0x66, 0x80, 0xce, 0x9c, 0xed, 0x97, 0xce, - 0xd9, 0xf8, 0x4d, 0xcd, 0xf3, 0x32, 0x5a, 0x26, 0xbf, 0x07, 0xbb, 0x2a, 0x20, 0x74, 0x5a, 0x34, - 0xb0, 0x9e, 0x9f, 0xd9, 0xfc, 0xeb, 0xbf, 0xee, 0x25, 0x57, 0x3b, 0xd1, 0x97, 0xc6, 0x52, 0xac, - 0x6f, 0x23, 0xdf, 0x62, 0x7d, 0x77, 0xd2, 0x7d, 0x03, 0xb5, 0x24, 0x24, 0xf4, 0xa8, 0x88, 0xbf, - 0x16, 0xa1, 0x59, 0xe2, 0x3b, 0x7a, 0x0f, 0xb5, 0x24, 0xbb, 0xe2, 0x8f, 0xad, 0x05, 0x6d, 0x9e, - 0xfe, 0x9b, 0x94, 0xe9, 0xbb, 0x02, 0x3d, 0x8d, 0xaf, 0x78, 0xf1, 0x8d, 0x78, 0xcd, 0xed, 0xb7, - 0x5d, 0x71, 0x9e, 0x68, 0x17, 0xc6, 0xcd, 0xad, 0xb5, 0xf3, 0xe3, 0xd6, 0xda, 0xf9, 0xba, 0xb0, - 0xb4, 0x9b, 0x85, 0xa5, 0x7d, 0x5f, 0x58, 0xda, 0xaf, 0x85, 0xa5, 0x0d, 0x75, 0xe5, 0xf8, 0xb3, - 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xe4, 0x78, 0xce, 0xb9, 0x05, 0x00, 0x00, + // 586 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xad, 0x93, 0xd4, 0x0d, 0x93, 0xa6, 0x54, 0xab, 0x28, 0x32, 0x46, 0x72, 0x23, 0xd3, 0x96, + 0x9c, 0x6c, 0x08, 0x37, 0x84, 0x90, 0x68, 0x13, 0xa1, 0x08, 0x8a, 0x84, 0x73, 0xe0, 0x88, 0x9c, + 0x78, 0x13, 0x56, 0x4a, 0x76, 0xcd, 0xee, 0x3a, 0x6a, 0x6e, 0xf0, 0xef, 0x7a, 0xe4, 0xc8, 0x09, + 0xd1, 0xfc, 0x0c, 0x4e, 0xc8, 0x6b, 0x3b, 0x1f, 0x25, 0xc6, 0x70, 0xb1, 0x66, 0x9e, 0xdf, 0x78, + 0xdf, 0xbc, 0xe7, 0x85, 0xd7, 0x13, 0x22, 0x3f, 0x45, 0x43, 0x67, 0xc4, 0x66, 0xee, 0x88, 0x51, + 0xe9, 0x13, 0x8a, 0x79, 0xb0, 0x59, 0xfa, 0x21, 0x71, 0x05, 0xe6, 0x73, 0x32, 0xc2, 0xc2, 0xc5, + 0xd7, 0x78, 0x14, 0x49, 0xc2, 0xe8, 0xba, 0x72, 0x42, 0xce, 0x24, 0x43, 0xcd, 0xf5, 0x88, 0x33, + 0x7f, 0xea, 0x64, 0x13, 0xe6, 0xc3, 0x09, 0x63, 0x93, 0x29, 0x76, 0x15, 0x6b, 0x18, 0x8d, 0x5d, + 0x3c, 0x0b, 0xe5, 0x22, 0x19, 0x32, 0x1f, 0xdc, 0x7d, 0xe9, 0xd3, 0xec, 0x55, 0x63, 0xc2, 0x26, + 0x4c, 0x95, 0x6e, 0x5c, 0xa5, 0xe8, 0x8b, 0x7f, 0x92, 0x2b, 0x17, 0x21, 0x16, 0xee, 0x8c, 0x45, + 0x54, 0x26, 0xcf, 0x74, 0xba, 0xfb, 0x1f, 0xd3, 0x2b, 0x70, 0x5d, 0x25, 0x5f, 0xb1, 0xbf, 0x96, + 0xa0, 0x7e, 0xc9, 0xb1, 0x2f, 0xb1, 0x87, 0x3f, 0x47, 0x58, 0x48, 0xd4, 0x84, 0x12, 0x09, 0x0c, + 0xad, 0xa5, 0xb5, 0xef, 0x5d, 0xe8, 0xcb, 0x1f, 0x27, 0xa5, 0x7e, 0xd7, 0x2b, 0x91, 0x00, 0xb5, + 0xa1, 0x22, 0x42, 0x3c, 0x32, 0x4a, 0x2d, 0xad, 0x5d, 0xeb, 0x34, 0x9c, 0x64, 0x5b, 0x27, 0xdb, + 0xd6, 0x79, 0x45, 0x17, 0x9e, 0x62, 0xa0, 0x0e, 0xe8, 0x9c, 0x31, 0x39, 0x16, 0x46, 0xb9, 0x55, + 0x6e, 0xd7, 0x3a, 0xa6, 0xb3, 0x6d, 0xa7, 0xd2, 0xe4, 0x5c, 0xc5, 0xbb, 0x78, 0x29, 0x13, 0x19, + 0x70, 0xc0, 0x23, 0x2a, 0xc9, 0x0c, 0x1b, 0x95, 0xf8, 0x68, 0x2f, 0x6b, 0x51, 0x03, 0xf6, 0x85, + 0x0c, 0x08, 0x35, 0xf6, 0x15, 0x9e, 0x34, 0xa8, 0x09, 0xba, 0x90, 0x01, 0x8b, 0xa4, 0xa1, 0x2b, + 0x38, 0xed, 0x52, 0x1c, 0x73, 0x6e, 0x1c, 0xac, 0x70, 0xcc, 0x39, 0x32, 0xa1, 0x2a, 0x31, 0x9f, + 0x11, 0xea, 0x4f, 0x8d, 0x6a, 0x4b, 0x6b, 0x57, 0xbd, 0x55, 0x6f, 0x3f, 0x87, 0xa3, 0xcc, 0x02, + 0x11, 0x32, 0x2a, 0x70, 0xae, 0x07, 0xc7, 0x50, 0x0e, 0x49, 0xa0, 0x2c, 0xa8, 0x7b, 0x71, 0x69, + 0x9f, 0xc3, 0xe1, 0x40, 0xfa, 0x5c, 0x16, 0xb8, 0x67, 0x3f, 0x86, 0x7a, 0x17, 0x4f, 0x71, 0xa1, + 0xcd, 0x76, 0x1f, 0x8e, 0x32, 0x62, 0x81, 0x98, 0x13, 0xa8, 0xe1, 0x6b, 0x22, 0x3f, 0x0a, 0xe9, + 0xcb, 0x48, 0xa4, 0xa2, 0x20, 0x86, 0x06, 0x0a, 0xb1, 0xcf, 0xa0, 0xd6, 0xa7, 0x63, 0x56, 0x74, + 0x62, 0x1d, 0x6a, 0x6f, 0x89, 0xc8, 0x36, 0xb0, 0xdf, 0xc1, 0x61, 0xd2, 0xa6, 0xc7, 0xbf, 0x04, + 0x58, 0xc5, 0x27, 0x0c, 0x4d, 0x25, 0x6a, 0xed, 0x4c, 0xf4, 0x32, 0xc3, 0xbc, 0x8d, 0x09, 0xfb, + 0x3e, 0xd4, 0x7b, 0x73, 0x4c, 0xa5, 0x48, 0x0f, 0xe8, 0xfc, 0x2a, 0xc3, 0xf1, 0x8a, 0x3a, 0x48, + 0xae, 0x16, 0xfa, 0x00, 0x7a, 0x92, 0x01, 0x3a, 0x73, 0x76, 0x5f, 0x3e, 0x67, 0xeb, 0x37, 0x35, + 0xcf, 0x8b, 0x68, 0xa9, 0xfc, 0x1e, 0xec, 0xab, 0x80, 0xd0, 0x69, 0xde, 0xc0, 0x66, 0x7e, 0x66, + 0xf3, 0x8f, 0xff, 0xba, 0x17, 0x5f, 0xf1, 0x58, 0x5f, 0x12, 0x4b, 0xbe, 0xbe, 0xad, 0x7c, 0xf3, + 0xf5, 0xdd, 0x49, 0xf7, 0x0d, 0x54, 0xe2, 0x90, 0xd0, 0xa3, 0x3c, 0xfe, 0x46, 0x84, 0x66, 0x81, + 0xef, 0xe8, 0x3d, 0x54, 0xe2, 0xec, 0xf2, 0x3f, 0xb6, 0x11, 0xb4, 0x79, 0xfa, 0x77, 0x52, 0xaa, + 0xef, 0x0a, 0xf4, 0x24, 0xbe, 0xfc, 0xc5, 0xb7, 0xe2, 0x35, 0x77, 0xdf, 0x76, 0xc5, 0x79, 0xa2, + 0x5d, 0x18, 0x37, 0xb7, 0xd6, 0xde, 0xf7, 0x5b, 0x6b, 0xef, 0xcb, 0xd2, 0xd2, 0x6e, 0x96, 0x96, + 0xf6, 0x6d, 0x69, 0x69, 0x3f, 0x97, 0x96, 0x36, 0xd4, 0x95, 0xe3, 0xcf, 0x7e, 0x07, 0x00, 0x00, + 0xff, 0xff, 0x8d, 0x48, 0xca, 0x8b, 0xc5, 0x05, 0x00, 0x00, } diff --git a/api/services/execution/execution.proto b/api/services/execution/execution.proto index cce7f01..1548696 100644 --- a/api/services/execution/execution.proto +++ b/api/services/execution/execution.proto @@ -5,8 +5,8 @@ package containerd.v1.services; import "google/protobuf/empty.proto"; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; -import "github.com/docker/containerd/api/types/mount/mount.proto"; -import "github.com/docker/containerd/api/types/container/container.proto"; +import "github.com/containerd/containerd/api/types/mount/mount.proto"; +import "github.com/containerd/containerd/api/types/container/container.proto"; service ContainerService { rpc Create(CreateRequest) returns (CreateResponse); diff --git a/api/services/rootfs/rootfs.pb.go b/api/services/rootfs/rootfs.pb.go index 50a4893..b012d69 100644 --- a/api/services/rootfs/rootfs.pb.go +++ b/api/services/rootfs/rootfs.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/services/rootfs/rootfs.proto +// source: github.com/containerd/containerd/api/services/rootfs/rootfs.proto // DO NOT EDIT! /* Package rootfs is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/services/rootfs/rootfs.proto + github.com/containerd/containerd/api/services/rootfs/rootfs.proto It has these top-level messages: UnpackRequest @@ -21,8 +21,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" -import containerd_v1_types "github.com/docker/containerd/api/types/mount" -import containerd_v1_types1 "github.com/docker/containerd/api/types/descriptor" +import containerd_v1_types "github.com/containerd/containerd/api/types/mount" +import containerd_v1_types1 "github.com/containerd/containerd/api/types/descriptor" import github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" @@ -232,7 +232,7 @@ var _RootFS_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "github.com/docker/containerd/api/services/rootfs/rootfs.proto", + Metadata: "github.com/containerd/containerd/api/services/rootfs/rootfs.proto", } func (m *UnpackRequest) Marshal() (dAtA []byte, err error) { @@ -1098,37 +1098,36 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/services/rootfs/rootfs.proto", fileDescriptorRootfs) + proto.RegisterFile("github.com/containerd/containerd/api/services/rootfs/rootfs.proto", fileDescriptorRootfs) } var fileDescriptorRootfs = []byte{ - // 433 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x4d, 0x6f, 0x13, 0x31, - 0x10, 0x8d, 0x29, 0xda, 0x04, 0xa3, 0xf4, 0x60, 0x71, 0x58, 0xad, 0x60, 0x13, 0x2d, 0x97, 0x08, - 0x89, 0xb5, 0x08, 0x07, 0xb8, 0xf4, 0x92, 0x86, 0x8a, 0x1e, 0x90, 0xd0, 0x22, 0x04, 0x37, 0xe4, - 0xae, 0x87, 0xad, 0xd5, 0xc6, 0x63, 0x6c, 0xa7, 0x52, 0x6e, 0xfc, 0x0e, 0x7e, 0x51, 0x8e, 0x1c, - 0x11, 0x12, 0x11, 0xdd, 0x5f, 0x82, 0xb2, 0x1f, 0xa1, 0x89, 0x0a, 0xf4, 0xc0, 0x65, 0x3d, 0x2b, - 0xbf, 0xf7, 0xe6, 0xcd, 0x1b, 0xd3, 0x83, 0x42, 0xf9, 0xd3, 0xf9, 0x49, 0x9a, 0xe3, 0x8c, 0x4b, - 0xcc, 0xcf, 0xc0, 0xf2, 0x1c, 0xb5, 0x17, 0x4a, 0x83, 0x95, 0x5c, 0x18, 0xc5, 0x1d, 0xd8, 0x0b, - 0x95, 0x83, 0xe3, 0x16, 0xd1, 0x7f, 0x6c, 0x8f, 0xd4, 0x58, 0xf4, 0xc8, 0xfa, 0xbf, 0xc1, 0xe9, - 0xc5, 0x93, 0xe8, 0x5e, 0x81, 0x05, 0x56, 0x37, 0x7c, 0x5d, 0xd5, 0xa0, 0xe8, 0xf9, 0x3f, 0x7b, - 0xf8, 0x85, 0x01, 0xc7, 0x67, 0x38, 0xd7, 0xbe, 0xfe, 0x36, 0xcc, 0xc9, 0x0d, 0x99, 0x12, 0x5c, - 0x6e, 0x95, 0xf1, 0x68, 0xaf, 0x94, 0xb5, 0x46, 0xf2, 0x92, 0xf6, 0xdf, 0x6a, 0x23, 0xf2, 0xb3, - 0x0c, 0x3e, 0xcd, 0xc1, 0x79, 0xf6, 0x8c, 0x06, 0xe7, 0x62, 0x01, 0xd6, 0x85, 0x64, 0xb8, 0x37, - 0xba, 0x3b, 0x1e, 0xa4, 0x5b, 0x43, 0xa4, 0x95, 0x64, 0x3a, 0xdd, 0xe8, 0x64, 0x0d, 0x3c, 0x51, - 0x74, 0xbf, 0x55, 0x72, 0x06, 0xb5, 0x03, 0xf6, 0x8e, 0x76, 0xf3, 0x53, 0xa1, 0xb4, 0x92, 0x21, - 0x19, 0x92, 0xd1, 0x9d, 0xc9, 0xc1, 0x72, 0x35, 0xe8, 0x7c, 0x5f, 0x0d, 0x1e, 0x5d, 0x31, 0x8e, - 0x06, 0xf4, 0xa6, 0x83, 0xe3, 0x05, 0x3e, 0x96, 0xaa, 0x00, 0xe7, 0xd3, 0x69, 0x75, 0x94, 0xab, - 0x41, 0xf7, 0x70, 0x2d, 0x72, 0x3c, 0xcd, 0x5a, 0xb5, 0xe4, 0x0b, 0xa1, 0xfb, 0xaf, 0x2d, 0x18, - 0x61, 0xa1, 0xb5, 0xcd, 0xe8, 0x6d, 0x2d, 0x66, 0x50, 0x37, 0xca, 0xaa, 0x9a, 0xbd, 0xa7, 0xbd, - 0x8a, 0xf1, 0x41, 0xc9, 0xf0, 0xd6, 0xff, 0x33, 0x70, 0x2c, 0x59, 0x44, 0x7b, 0x16, 0x84, 0x44, - 0x7d, 0xbe, 0x08, 0xf7, 0x86, 0x64, 0xd4, 0xcb, 0x36, 0xff, 0xc9, 0x43, 0xda, 0x7f, 0xb5, 0x5e, - 0x92, 0xfb, 0x8b, 0xb5, 0xe4, 0xb0, 0x01, 0x6d, 0xb2, 0x1a, 0xd3, 0xa0, 0x5a, 0x6d, 0x1b, 0x7b, - 0x74, 0x6d, 0xec, 0x35, 0xa7, 0x41, 0x8e, 0x7f, 0x10, 0x1a, 0x64, 0x88, 0xfe, 0xe8, 0x0d, 0x7b, - 0x41, 0x83, 0x3a, 0x7c, 0x76, 0x7f, 0x87, 0xb8, 0xb5, 0xdd, 0xe8, 0xc1, 0x1f, 0x6e, 0x1b, 0x17, - 0x47, 0xb4, 0xdb, 0xe4, 0xca, 0x76, 0x91, 0xdb, 0x79, 0x47, 0xbb, 0x6d, 0xb6, 0xa7, 0x99, 0xd2, - 0xa0, 0xce, 0x80, 0x5d, 0x8b, 0x73, 0x37, 0x52, 0x99, 0x84, 0xcb, 0xcb, 0xb8, 0xf3, 0xed, 0x32, - 0xee, 0x7c, 0x2e, 0x63, 0xb2, 0x2c, 0x63, 0xf2, 0xb5, 0x8c, 0xc9, 0xcf, 0x32, 0x26, 0x27, 0x41, - 0xf5, 0x78, 0x9f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x52, 0xeb, 0x01, 0xe0, 0xa0, 0x03, 0x00, - 0x00, + // 428 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x4d, 0xab, 0xd3, 0x40, + 0x14, 0xed, 0xf8, 0x24, 0xad, 0x23, 0x7d, 0x8b, 0xc1, 0x45, 0x08, 0x9a, 0x94, 0xb8, 0x29, 0x82, + 0x09, 0xd6, 0x85, 0x1b, 0x5d, 0xf8, 0x5e, 0x2c, 0xbe, 0x85, 0x20, 0x11, 0xd1, 0x9d, 0x4c, 0x93, + 0x31, 0x1d, 0x6c, 0xe7, 0x8e, 0x33, 0xd3, 0x42, 0x77, 0xfe, 0x0e, 0x7f, 0x51, 0x97, 0x2e, 0x45, + 0xb0, 0xd8, 0xfc, 0x12, 0x69, 0xbe, 0x6c, 0x4a, 0x95, 0x0a, 0x6f, 0x93, 0xb9, 0x61, 0xce, 0x39, + 0xf7, 0xdc, 0x73, 0x07, 0x3f, 0xcf, 0xb8, 0x99, 0x2e, 0x26, 0x41, 0x02, 0xf3, 0x30, 0x01, 0x61, + 0x28, 0x17, 0x4c, 0xa5, 0xfb, 0x25, 0x95, 0x3c, 0xd4, 0x4c, 0x2d, 0x79, 0xc2, 0x74, 0xa8, 0x00, + 0xcc, 0xc7, 0xfa, 0x08, 0xa4, 0x02, 0x03, 0xa4, 0xff, 0x07, 0x1c, 0x2c, 0x1f, 0x39, 0x77, 0x32, + 0xc8, 0xa0, 0xb8, 0x09, 0x77, 0x55, 0x09, 0x72, 0x9e, 0x9e, 0xd4, 0xc7, 0xac, 0x24, 0xd3, 0xe1, + 0x1c, 0x16, 0xc2, 0x94, 0xdf, 0x8a, 0x3d, 0xfe, 0x0f, 0x76, 0xca, 0x74, 0xa2, 0xb8, 0x34, 0xa0, + 0xf6, 0xca, 0x52, 0xc7, 0x7f, 0x89, 0xfb, 0x6f, 0x85, 0xa4, 0xc9, 0xa7, 0x98, 0x7d, 0x5e, 0x30, + 0x6d, 0xc8, 0x13, 0x6c, 0xcd, 0xe8, 0x8a, 0x29, 0x6d, 0xa3, 0xc1, 0xd9, 0xf0, 0xf6, 0xc8, 0x0b, + 0x5a, 0xc3, 0x04, 0x85, 0x64, 0x10, 0x35, 0x3a, 0x71, 0x05, 0xf7, 0x39, 0x3e, 0xaf, 0x95, 0xb4, + 0x04, 0xa1, 0x19, 0x79, 0x87, 0xbb, 0xc9, 0x94, 0x72, 0xc1, 0x53, 0x1b, 0x0d, 0xd0, 0xf0, 0xd6, + 0xc5, 0xb3, 0xf5, 0xc6, 0xeb, 0xfc, 0xd8, 0x78, 0x0f, 0xf6, 0xcc, 0x83, 0x64, 0xa2, 0xe9, 0xa0, + 0xc3, 0x0c, 0x1e, 0xa6, 0x3c, 0x63, 0xda, 0x04, 0x51, 0x71, 0xe4, 0x1b, 0xaf, 0x7b, 0xb9, 0x13, + 0xb9, 0x8a, 0xe2, 0x5a, 0xcd, 0xff, 0x8a, 0xf0, 0xf9, 0x6b, 0xc5, 0x24, 0x55, 0xac, 0xb6, 0x4d, + 0xf0, 0x4d, 0x41, 0xe7, 0xac, 0x6c, 0x14, 0x17, 0x35, 0x79, 0x8f, 0x7b, 0x05, 0xe3, 0x03, 0x4f, + 0xed, 0x1b, 0xd7, 0x67, 0xe0, 0x2a, 0x25, 0x0e, 0xee, 0x29, 0x46, 0x53, 0x10, 0xb3, 0x95, 0x7d, + 0x36, 0x40, 0xc3, 0x5e, 0xdc, 0xfc, 0xfb, 0xf7, 0x71, 0xff, 0xd5, 0x6e, 0x51, 0xfa, 0x1f, 0xd6, + 0xfc, 0xcb, 0x0a, 0xd4, 0x64, 0x35, 0xc2, 0x56, 0xb1, 0xde, 0x3a, 0x76, 0xe7, 0x68, 0xec, 0x25, + 0xa7, 0x42, 0x8e, 0x7e, 0x22, 0x6c, 0xc5, 0x00, 0x66, 0xfc, 0x86, 0xbc, 0xc0, 0x56, 0x19, 0x3e, + 0xb9, 0x7b, 0x40, 0x6c, 0x6d, 0xd7, 0xb9, 0xf7, 0x97, 0xdb, 0xca, 0xc5, 0x18, 0x77, 0xab, 0x5c, + 0xc9, 0x21, 0xb2, 0x9d, 0xb7, 0x73, 0xd8, 0xa6, 0x3d, 0x4d, 0x84, 0xad, 0x32, 0x03, 0x72, 0x14, + 0xa7, 0x4f, 0x52, 0xb9, 0xb0, 0xd7, 0x5b, 0xb7, 0xf3, 0x7d, 0xeb, 0x76, 0xbe, 0xe4, 0x2e, 0x5a, + 0xe7, 0x2e, 0xfa, 0x96, 0xbb, 0xe8, 0x57, 0xee, 0xa2, 0x89, 0x55, 0x3c, 0xde, 0xc7, 0xbf, 0x03, + 0x00, 0x00, 0xff, 0xff, 0x3c, 0xba, 0xae, 0xaa, 0xac, 0x03, 0x00, 0x00, } diff --git a/api/services/rootfs/rootfs.proto b/api/services/rootfs/rootfs.proto index 070f097..b46985e 100644 --- a/api/services/rootfs/rootfs.proto +++ b/api/services/rootfs/rootfs.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package containerd.v1; import "gogoproto/gogo.proto"; -import "github.com/docker/containerd/api/types/mount/mount.proto"; -import "github.com/docker/containerd/api/types/descriptor/descriptor.proto"; +import "github.com/containerd/containerd/api/types/mount/mount.proto"; +import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto"; service RootFS { rpc Unpack(UnpackRequest) returns (UnpackResponse); diff --git a/api/services/shim/shim.pb.go b/api/services/shim/shim.pb.go index 9c349cf..a128793 100644 --- a/api/services/shim/shim.pb.go +++ b/api/services/shim/shim.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/services/shim/shim.proto +// source: github.com/containerd/containerd/api/services/shim/shim.proto // DO NOT EDIT! /* Package shim is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/services/shim/shim.proto + github.com/containerd/containerd/api/services/shim/shim.proto It has these top-level messages: CreateRequest @@ -33,8 +33,8 @@ import math "math" import google_protobuf "github.com/gogo/protobuf/types" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" import _ "github.com/gogo/protobuf/gogoproto" -import containerd_v1_types "github.com/docker/containerd/api/types/mount" -import containerd_v1_types1 "github.com/docker/containerd/api/types/container" +import containerd_v1_types "github.com/containerd/containerd/api/types/mount" +import containerd_v1_types1 "github.com/containerd/containerd/api/types/container" import ( context "golang.org/x/net/context" @@ -603,7 +603,7 @@ var _Shim_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "github.com/docker/containerd/api/services/shim/shim.proto", + Metadata: "github.com/containerd/containerd/api/services/shim/shim.proto", } func (m *CreateRequest) Marshal() (dAtA []byte, err error) { @@ -3043,60 +3043,59 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/services/shim/shim.proto", fileDescriptorShim) + proto.RegisterFile("github.com/containerd/containerd/api/services/shim/shim.proto", fileDescriptorShim) } var fileDescriptorShim = []byte{ - // 804 bytes of a gzipped FileDescriptorProto + // 800 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0xaf, 0x13, 0xaf, 0x77, 0xf7, 0xa5, 0x4e, 0xd1, 0x68, 0xb5, 0x72, 0xbd, 0x28, 0x0d, 0xbe, - 0x90, 0x16, 0xc9, 0xa6, 0xe9, 0x05, 0x38, 0x41, 0xd9, 0x45, 0x80, 0x8a, 0x14, 0xcd, 0x1e, 0x91, - 0xa8, 0x9c, 0x78, 0x36, 0x19, 0x11, 0x7b, 0x8c, 0x67, 0x1c, 0x9a, 0x1b, 0x67, 0xbe, 0x01, 0x5f, + 0x14, 0xaf, 0x13, 0xaf, 0x37, 0xfb, 0x52, 0xa7, 0x68, 0xb4, 0x5a, 0xb9, 0x5e, 0x94, 0x06, 0x5f, + 0x48, 0x8b, 0xe4, 0xd0, 0xf4, 0x86, 0xe0, 0x40, 0xc9, 0x22, 0x40, 0x45, 0x8a, 0x66, 0x8f, 0x48, + 0x54, 0x4e, 0x3c, 0x9b, 0x8c, 0x14, 0x7b, 0x8c, 0x67, 0x1c, 0x9a, 0x1b, 0x67, 0xbe, 0x01, 0x5f, 0x87, 0x53, 0x8f, 0x5c, 0x90, 0x38, 0x21, 0x9a, 0x4f, 0x82, 0xe6, 0x8f, 0xe3, 0xa4, 0x4d, 0xe2, - 0xf4, 0x62, 0xcd, 0x7b, 0xf3, 0x7b, 0xcf, 0xef, 0xfd, 0xde, 0xef, 0x0d, 0x7c, 0x3e, 0xa5, 0x62, - 0x56, 0x8e, 0xc3, 0x09, 0x4b, 0xa3, 0x84, 0x4d, 0x7e, 0x26, 0x45, 0x34, 0x61, 0x99, 0x88, 0x69, - 0x46, 0x8a, 0x24, 0x8a, 0x73, 0x1a, 0x71, 0x52, 0x2c, 0xe8, 0x84, 0xf0, 0x88, 0xcf, 0x68, 0xaa, - 0x3e, 0x61, 0x5e, 0x30, 0xc1, 0xd0, 0x55, 0x0d, 0x0c, 0x17, 0x4f, 0xc3, 0x0a, 0x17, 0x4a, 0x88, - 0xff, 0x70, 0xca, 0xd8, 0x74, 0x4e, 0x22, 0x05, 0x1d, 0x97, 0x77, 0x51, 0x9c, 0x2d, 0x75, 0x9c, - 0x7f, 0xf5, 0xf6, 0x15, 0x49, 0x73, 0x51, 0x5d, 0x5e, 0x4c, 0xd9, 0x94, 0xa9, 0x63, 0x24, 0x4f, - 0xc6, 0xfb, 0x59, 0x63, 0x95, 0x62, 0x99, 0x13, 0x1e, 0xa5, 0xac, 0xcc, 0x84, 0xfe, 0x9a, 0xc8, - 0x2f, 0x8f, 0x8c, 0x5c, 0x3b, 0xeb, 0x93, 0xce, 0x10, 0xfc, 0xde, 0x02, 0xf7, 0xeb, 0x82, 0xc4, - 0x82, 0x60, 0xf2, 0x4b, 0x49, 0xb8, 0x40, 0x97, 0xd0, 0xa2, 0x89, 0x67, 0xf5, 0xad, 0xc1, 0xf9, - 0x73, 0x67, 0xf5, 0xef, 0xa3, 0xd6, 0x77, 0xd7, 0xb8, 0x45, 0x13, 0x74, 0x09, 0xce, 0xb8, 0xcc, - 0x92, 0x39, 0xf1, 0x5a, 0xf2, 0x0e, 0x1b, 0x0b, 0x79, 0x70, 0x5a, 0x94, 0x99, 0xa0, 0x29, 0xf1, - 0xda, 0xea, 0xa2, 0x32, 0xd1, 0x43, 0x38, 0xcb, 0xd8, 0xcb, 0x9c, 0x2e, 0x98, 0xf0, 0xec, 0xbe, - 0x35, 0x38, 0xc3, 0xa7, 0x19, 0x1b, 0x49, 0x13, 0xf9, 0x70, 0x26, 0x48, 0x91, 0xd2, 0x2c, 0x9e, - 0x7b, 0x27, 0xea, 0x6a, 0x6d, 0xa3, 0x0b, 0x38, 0xe1, 0x22, 0xa1, 0x99, 0xe7, 0xa8, 0x74, 0xda, - 0x90, 0xbf, 0xe7, 0x22, 0x61, 0xa5, 0xf0, 0x4e, 0xf5, 0xef, 0xb5, 0x65, 0xfc, 0xa4, 0x28, 0xbc, - 0xb3, 0xb5, 0x9f, 0x14, 0x05, 0x1a, 0x82, 0x53, 0x30, 0x26, 0xee, 0xb8, 0x77, 0xde, 0x6f, 0x0f, - 0x3a, 0x43, 0x3f, 0xdc, 0x1e, 0xa8, 0x22, 0x26, 0xfc, 0x41, 0x92, 0x89, 0x0d, 0x32, 0x08, 0xa0, - 0x5b, 0x71, 0xc1, 0x73, 0x96, 0x71, 0x82, 0x3e, 0x80, 0x76, 0x6e, 0xd8, 0x70, 0xb1, 0x3c, 0x06, - 0x5d, 0xb8, 0x7f, 0x2b, 0xe2, 0x42, 0x18, 0xba, 0x82, 0x8f, 0xc0, 0xbd, 0x26, 0x73, 0x52, 0xf3, - 0xf7, 0x6e, 0xc8, 0x53, 0xe8, 0x56, 0x10, 0x93, 0xf6, 0x11, 0x74, 0xc8, 0x2b, 0x2a, 0x5e, 0x72, - 0x11, 0x8b, 0x92, 0x1b, 0x2c, 0x48, 0xd7, 0xad, 0xf2, 0x04, 0x7f, 0x58, 0xd0, 0xb9, 0x79, 0x45, - 0x26, 0x55, 0xd2, 0x4d, 0xbe, 0xac, 0x7d, 0x7c, 0xb5, 0x76, 0xf3, 0xd5, 0xde, 0xc3, 0x97, 0xbd, - 0xc5, 0xd7, 0x00, 0x6c, 0x9e, 0x93, 0x89, 0x9a, 0x46, 0x67, 0x78, 0x11, 0x6a, 0x19, 0x87, 0x95, - 0x8c, 0xc3, 0xaf, 0xb2, 0x25, 0x56, 0x88, 0xe0, 0x1a, 0x1c, 0x3c, 0xa7, 0x29, 0x15, 0x08, 0x81, - 0x2d, 0x69, 0xd4, 0x62, 0xc1, 0xea, 0x2c, 0x7d, 0xb3, 0xb8, 0x48, 0x54, 0x31, 0x36, 0x56, 0x67, - 0xe9, 0xe3, 0xec, 0x4e, 0x57, 0x62, 0x63, 0x75, 0x0e, 0xfa, 0x70, 0x5f, 0x37, 0xb8, 0x97, 0xe9, - 0x17, 0x00, 0x23, 0xb1, 0xdc, 0x4b, 0xab, 0xec, 0xfb, 0x57, 0x9a, 0x88, 0x99, 0xfa, 0x95, 0x8b, - 0xb5, 0x21, 0xfb, 0x9b, 0x11, 0x3a, 0x9d, 0xe9, 0xbf, 0xb9, 0xd8, 0x58, 0xc1, 0x03, 0x70, 0x6f, - 0x16, 0x24, 0x13, 0xbc, 0x1a, 0x9c, 0x1e, 0xe4, 0x7a, 0x6e, 0xc1, 0x9f, 0x16, 0xb8, 0xc6, 0x61, - 0x4a, 0x7a, 0xdf, 0x4d, 0x30, 0x25, 0xb6, 0xeb, 0x12, 0x9f, 0x49, 0xb2, 0xd5, 0x88, 0x25, 0xd9, - 0xdd, 0xe1, 0xd5, 0x4e, 0x11, 0xea, 0x99, 0x63, 0x03, 0x45, 0x5f, 0xc0, 0x79, 0x5e, 0xb0, 0x09, - 0xe1, 0x9c, 0x70, 0xef, 0x44, 0x89, 0xf7, 0xc3, 0x9d, 0x71, 0x23, 0x8d, 0xc2, 0x35, 0x5c, 0x36, - 0x35, 0x8a, 0x4b, 0xbe, 0x6e, 0xea, 0x01, 0xb8, 0x98, 0xf0, 0x32, 0x5d, 0x3b, 0x5c, 0xa9, 0x2b, - 0x5a, 0xa9, 0x77, 0xf8, 0xb7, 0x03, 0xf6, 0xed, 0x8c, 0xa6, 0x28, 0x06, 0x47, 0x4b, 0x1f, 0x3d, - 0x09, 0x0f, 0xbc, 0x7c, 0xe1, 0xd6, 0x5b, 0xe1, 0x7f, 0x72, 0x14, 0xd6, 0xd0, 0xf9, 0x3d, 0x9c, - 0xa8, 0xcd, 0x41, 0x8f, 0x0f, 0x46, 0x6d, 0x6e, 0x97, 0x7f, 0xf9, 0x8e, 0x0e, 0x6f, 0xe4, 0x73, - 0x2a, 0xcb, 0xd5, 0x2b, 0xd5, 0x50, 0xee, 0xd6, 0x6a, 0x36, 0x94, 0xfb, 0xd6, 0x8e, 0xfe, 0x08, - 0xb6, 0x14, 0x28, 0x1a, 0x1c, 0x0c, 0xda, 0x58, 0x52, 0xff, 0xf1, 0x11, 0x48, 0x93, 0xfc, 0x1b, - 0x68, 0x8f, 0xc4, 0x12, 0x7d, 0x7c, 0x30, 0xa2, 0x56, 0xff, 0x5e, 0x1e, 0x30, 0x38, 0x5a, 0xd5, - 0x0d, 0x3c, 0x6c, 0x49, 0xdf, 0xdf, 0xfd, 0x16, 0x2a, 0xcc, 0xa7, 0x16, 0xfa, 0x49, 0xcd, 0x49, - 0x90, 0xe6, 0x39, 0xd5, 0xcc, 0x3e, 0x39, 0x06, 0x5a, 0xeb, 0x40, 0x69, 0xb4, 0x21, 0xff, 0xa6, - 0x8e, 0xf7, 0xf6, 0xff, 0x02, 0x1c, 0xad, 0xef, 0x86, 0xfe, 0xb7, 0x96, 0x60, 0x6f, 0xb6, 0x6f, - 0xe5, 0xc8, 0xa9, 0x68, 0x1c, 0x39, 0x6d, 0xd2, 0xe7, 0x73, 0xef, 0xf5, 0x9b, 0xde, 0xbd, 0x7f, - 0xde, 0xf4, 0xee, 0xfd, 0xb6, 0xea, 0x59, 0xaf, 0x57, 0x3d, 0xeb, 0xaf, 0x55, 0xcf, 0xfa, 0x6f, - 0xd5, 0xb3, 0xc6, 0x8e, 0x42, 0x3e, 0xfb, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x83, 0x97, 0x53, 0x90, - 0x9b, 0x08, 0x00, 0x00, + 0xec, 0xc5, 0x7a, 0xef, 0xcd, 0xef, 0x8d, 0xdf, 0xfb, 0xbd, 0xdf, 0x1b, 0xf8, 0x6a, 0x46, 0xc5, + 0xbc, 0x98, 0x84, 0x53, 0x96, 0x0c, 0xa6, 0x2c, 0x15, 0x11, 0x4d, 0x49, 0x1e, 0x6f, 0x9b, 0x51, + 0x46, 0x07, 0x9c, 0xe4, 0x4b, 0x3a, 0x25, 0x7c, 0xc0, 0xe7, 0x34, 0x51, 0x9f, 0x30, 0xcb, 0x99, + 0x60, 0xe8, 0xba, 0x02, 0x86, 0xcb, 0xe7, 0x61, 0x89, 0x0b, 0x25, 0xc4, 0x7f, 0x3c, 0x63, 0x6c, + 0xb6, 0x20, 0x03, 0x05, 0x9d, 0x14, 0x77, 0x83, 0x28, 0x5d, 0xe9, 0x3c, 0xff, 0xfa, 0xfd, 0x23, + 0x92, 0x64, 0xa2, 0x3c, 0xbc, 0x9c, 0xb1, 0x19, 0x53, 0xe6, 0x40, 0x5a, 0x26, 0xfa, 0xe5, 0x49, + 0x95, 0x8a, 0x55, 0x46, 0xf8, 0x20, 0x61, 0x45, 0x2a, 0xf4, 0xd7, 0x64, 0x8f, 0xee, 0x91, 0xbd, + 0x09, 0x56, 0x96, 0xbe, 0x25, 0xf8, 0xbd, 0x01, 0xee, 0x37, 0x39, 0x89, 0x04, 0xc1, 0xe4, 0x97, + 0x82, 0x70, 0x81, 0xae, 0xa0, 0x41, 0x63, 0xcf, 0xea, 0x59, 0xfd, 0x8b, 0x97, 0xce, 0xfa, 0xdf, + 0x27, 0x8d, 0xef, 0x47, 0xb8, 0x41, 0x63, 0x74, 0x05, 0xce, 0xa4, 0x48, 0xe3, 0x05, 0xf1, 0x1a, + 0xf2, 0x0c, 0x1b, 0x0f, 0x79, 0x70, 0x9e, 0x17, 0xa9, 0xa0, 0x09, 0xf1, 0x9a, 0xea, 0xa0, 0x74, + 0xd1, 0x63, 0x68, 0xa5, 0xec, 0x75, 0x46, 0x97, 0x4c, 0x78, 0x76, 0xcf, 0xea, 0xb7, 0xf0, 0x79, + 0xca, 0xc6, 0xd2, 0x45, 0x3e, 0xb4, 0x04, 0xc9, 0x13, 0x9a, 0x46, 0x0b, 0xef, 0x4c, 0x1d, 0x6d, + 0x7c, 0x74, 0x09, 0x67, 0x5c, 0xc4, 0x34, 0xf5, 0x1c, 0x75, 0x9d, 0x76, 0xe4, 0xef, 0xb9, 0x88, + 0x59, 0x21, 0xbc, 0x73, 0xfd, 0x7b, 0xed, 0x99, 0x38, 0xc9, 0x73, 0xaf, 0xb5, 0x89, 0x93, 0x3c, + 0x47, 0x43, 0x70, 0x72, 0xc6, 0xc4, 0x1d, 0xf7, 0x2e, 0x7a, 0xcd, 0x7e, 0x7b, 0xe8, 0x87, 0xbb, + 0x83, 0x55, 0xc4, 0x84, 0x3f, 0x4a, 0x42, 0xb1, 0x41, 0x06, 0x01, 0x74, 0x4a, 0x2e, 0x78, 0xc6, + 0x52, 0x4e, 0xd0, 0x47, 0xd0, 0xcc, 0x0c, 0x1b, 0x2e, 0x96, 0x66, 0xd0, 0x81, 0x87, 0xb7, 0x22, + 0xca, 0x85, 0xa1, 0x2b, 0xf8, 0x04, 0xdc, 0x11, 0x59, 0x90, 0x8a, 0xbf, 0x0f, 0x53, 0x9e, 0x43, + 0xa7, 0x84, 0x98, 0x6b, 0x9f, 0x40, 0x9b, 0xbc, 0xa1, 0xe2, 0x35, 0x17, 0x91, 0x28, 0xb8, 0xc1, + 0x82, 0x0c, 0xdd, 0xaa, 0x48, 0xf0, 0x87, 0x05, 0xed, 0x9b, 0x37, 0x64, 0x5a, 0x5e, 0xba, 0xcd, + 0x97, 0x75, 0x88, 0xaf, 0xc6, 0x7e, 0xbe, 0x9a, 0x07, 0xf8, 0xb2, 0x77, 0xf8, 0xea, 0x83, 0xcd, + 0x33, 0x32, 0x55, 0xd3, 0x68, 0x0f, 0x2f, 0x43, 0x2d, 0xe7, 0xb0, 0x94, 0x73, 0xf8, 0x75, 0xba, + 0xc2, 0x0a, 0x11, 0x8c, 0xc0, 0xc1, 0x0b, 0x9a, 0x50, 0x81, 0x10, 0xd8, 0x92, 0x46, 0x2d, 0x16, + 0xac, 0x6c, 0x19, 0x9b, 0x47, 0x79, 0xac, 0x8a, 0xb1, 0xb1, 0xb2, 0x65, 0x8c, 0xb3, 0x3b, 0x5d, + 0x89, 0x8d, 0x95, 0x1d, 0xf4, 0xe0, 0xa1, 0x6e, 0xf0, 0x20, 0xd3, 0xaf, 0x00, 0xc6, 0x62, 0x75, + 0x90, 0x56, 0xd9, 0xf7, 0xaf, 0x34, 0x16, 0x73, 0xf5, 0x2b, 0x17, 0x6b, 0x47, 0xf6, 0x37, 0x27, + 0x74, 0x36, 0xd7, 0x7f, 0x73, 0xb1, 0xf1, 0x82, 0x47, 0xe0, 0xde, 0x2c, 0x49, 0x2a, 0x78, 0x39, + 0x38, 0x3d, 0xc8, 0xcd, 0xdc, 0x82, 0x3f, 0x2d, 0x70, 0x4d, 0xc0, 0x94, 0x74, 0xdf, 0x4d, 0x30, + 0x25, 0x36, 0xab, 0x12, 0x5f, 0x48, 0xb2, 0xd5, 0x88, 0x25, 0xd9, 0x9d, 0xe1, 0xf5, 0x5e, 0x11, + 0xea, 0x99, 0x63, 0x03, 0x45, 0x5f, 0xc0, 0x45, 0x96, 0xb3, 0x29, 0xe1, 0x9c, 0x70, 0xef, 0x4c, + 0x89, 0xf7, 0xe3, 0xbd, 0x79, 0x63, 0x8d, 0xc2, 0x15, 0x5c, 0x36, 0x35, 0x8e, 0x0a, 0xbe, 0x69, + 0xea, 0x11, 0xb8, 0x98, 0xf0, 0x22, 0xd9, 0x04, 0x5c, 0xa9, 0x2b, 0x5a, 0xaa, 0x77, 0xf8, 0xb7, + 0x03, 0xf6, 0xed, 0x9c, 0x26, 0x28, 0x02, 0x47, 0x4b, 0x1f, 0x3d, 0x0b, 0x8f, 0xbc, 0x80, 0xe1, + 0xce, 0x5b, 0xe1, 0x7f, 0x76, 0x12, 0xd6, 0xd0, 0xf9, 0x03, 0x9c, 0xa9, 0xcd, 0x41, 0x4f, 0x8f, + 0x66, 0x6d, 0x6f, 0x97, 0x7f, 0xf5, 0x81, 0x0e, 0x6f, 0xe4, 0xb3, 0x2a, 0xcb, 0xd5, 0x2b, 0x55, + 0x53, 0xee, 0xce, 0x6a, 0xd6, 0x94, 0xfb, 0xde, 0x8e, 0xfe, 0x04, 0xb6, 0x14, 0x28, 0xea, 0x1f, + 0x4d, 0xda, 0x5a, 0x52, 0xff, 0xe9, 0x09, 0x48, 0x73, 0xf9, 0xb7, 0xd0, 0x1c, 0x8b, 0x15, 0xfa, + 0xf4, 0x68, 0x46, 0xa5, 0xfe, 0x83, 0x3c, 0x60, 0x70, 0xb4, 0xaa, 0x6b, 0x78, 0xd8, 0x91, 0xbe, + 0xbf, 0xff, 0x2d, 0x54, 0x98, 0xcf, 0x2d, 0xf4, 0xb3, 0x9a, 0x93, 0x20, 0xf5, 0x73, 0xaa, 0x98, + 0x7d, 0x76, 0x0a, 0xb4, 0xd2, 0x81, 0xd2, 0x68, 0xcd, 0xfd, 0xdb, 0x3a, 0x3e, 0xd8, 0xff, 0x2b, + 0x70, 0xb4, 0xbe, 0x6b, 0xfa, 0xdf, 0x59, 0x82, 0x83, 0xb7, 0x7d, 0x27, 0x47, 0x4e, 0x45, 0xed, + 0xc8, 0x69, 0x9d, 0x3e, 0x5f, 0x7a, 0x6f, 0xdf, 0x75, 0x1f, 0xfc, 0xf3, 0xae, 0xfb, 0xe0, 0xb7, + 0x75, 0xd7, 0x7a, 0xbb, 0xee, 0x5a, 0x7f, 0xad, 0xbb, 0xd6, 0x7f, 0xeb, 0xae, 0x35, 0x71, 0x14, + 0xf2, 0xc5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x76, 0x56, 0x67, 0xa7, 0x08, 0x00, 0x00, } diff --git a/api/services/shim/shim.proto b/api/services/shim/shim.proto index 255e6e8..c072014 100644 --- a/api/services/shim/shim.proto +++ b/api/services/shim/shim.proto @@ -5,8 +5,8 @@ package containerd.v1.services.shim; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "gogoproto/gogo.proto"; -import "github.com/docker/containerd/api/types/mount/mount.proto"; -import "github.com/docker/containerd/api/types/container/container.proto"; +import "github.com/containerd/containerd/api/types/mount/mount.proto"; +import "github.com/containerd/containerd/api/types/container/container.proto"; service Shim { rpc Create(CreateRequest) returns (CreateResponse); diff --git a/api/types/container/container.pb.go b/api/types/container/container.pb.go index 83024f7..977b19d 100644 --- a/api/types/container/container.pb.go +++ b/api/types/container/container.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/types/container/container.proto +// source: github.com/containerd/containerd/api/types/container/container.proto // DO NOT EDIT! /* Package container is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/types/container/container.proto + github.com/containerd/containerd/api/types/container/container.proto It has these top-level messages: Container @@ -1311,42 +1311,42 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/types/container/container.proto", fileDescriptorContainer) + proto.RegisterFile("github.com/containerd/containerd/api/types/container/container.proto", fileDescriptorContainer) } var fileDescriptorContainer = []byte{ - // 521 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6f, 0xd3, 0x4c, - 0x10, 0xcd, 0xda, 0x8e, 0x93, 0x4c, 0xd5, 0x7c, 0xab, 0xfd, 0x10, 0x32, 0x45, 0x72, 0xad, 0x08, - 0x09, 0x0b, 0x09, 0x47, 0xb4, 0x17, 0x8e, 0xa4, 0xb1, 0x55, 0x22, 0x84, 0x13, 0x36, 0x8e, 0xe8, - 0x2d, 0x72, 0xb3, 0x2b, 0xb3, 0xd0, 0xda, 0x91, 0xed, 0x04, 0x7a, 0xe3, 0xe7, 0xf5, 0xc8, 0x91, - 0x13, 0xd0, 0xfc, 0x06, 0x7e, 0x00, 0xda, 0x4d, 0x52, 0x57, 0x55, 0x90, 0xb8, 0x58, 0x6f, 0xc6, - 0xcf, 0x6f, 0xe6, 0xbd, 0x91, 0xe1, 0x55, 0x22, 0xca, 0x0f, 0x8b, 0x73, 0x6f, 0x96, 0x5d, 0x76, - 0x59, 0x36, 0xfb, 0xc4, 0xf3, 0xee, 0x2c, 0x4b, 0xcb, 0x58, 0xa4, 0x3c, 0x67, 0xdd, 0x78, 0x2e, - 0xba, 0xe5, 0xd5, 0x9c, 0x17, 0x55, 0xb3, 0x42, 0xde, 0x3c, 0xcf, 0xca, 0x8c, 0xfc, 0x5f, 0xf1, - 0xbd, 0xe5, 0x0b, 0x4f, 0xd1, 0x0f, 0x1e, 0x24, 0x59, 0x92, 0xa9, 0xf7, 0x5d, 0x89, 0xd6, 0xd4, - 0xce, 0x47, 0x68, 0xf5, 0xb7, 0x64, 0xf2, 0x10, 0x34, 0xc1, 0x2c, 0xe4, 0x20, 0xb7, 0x75, 0x62, - 0xae, 0x7e, 0x1c, 0x6a, 0x03, 0x9f, 0x6a, 0x82, 0x11, 0x0c, 0xfa, 0x5c, 0x30, 0x4b, 0x73, 0x90, - 0xbb, 0x4f, 0x25, 0x24, 0xc7, 0x60, 0x16, 0x65, 0x5c, 0x2e, 0x0a, 0x4b, 0x77, 0x90, 0xdb, 0x3e, - 0x7a, 0xec, 0xed, 0x18, 0xe9, 0x8d, 0x15, 0x85, 0x6e, 0xa8, 0x9d, 0xdf, 0x08, 0x1a, 0xa3, 0x3c, - 0x9b, 0xf1, 0xa2, 0xd8, 0x4a, 0xa2, 0x4a, 0x92, 0x80, 0x11, 0xe7, 0x49, 0x61, 0x69, 0x8e, 0xee, - 0xb6, 0xa8, 0xc2, 0x92, 0xc5, 0xd3, 0xa5, 0xa5, 0xab, 0x96, 0x84, 0xe4, 0x39, 0x18, 0x8b, 0x82, - 0xe7, 0x96, 0xe1, 0x20, 0x77, 0xef, 0xe8, 0xd1, 0xce, 0xb1, 0x93, 0x82, 0xe7, 0x54, 0xd1, 0xa4, - 0xc0, 0xec, 0x33, 0xb3, 0xea, 0xd2, 0x12, 0x95, 0x90, 0x1c, 0x40, 0xb3, 0xe4, 0xf9, 0xa5, 0x48, - 0xe3, 0x0b, 0xcb, 0x74, 0x90, 0xdb, 0xa4, 0xb7, 0x35, 0x39, 0x84, 0x3d, 0xfe, 0x45, 0x94, 0xd3, - 0x8d, 0xb5, 0x86, 0x5a, 0x0e, 0x64, 0x6b, 0xed, 0xe4, 0x8e, 0xed, 0xe6, 0xbf, 0xdb, 0x1e, 0x83, - 0x31, 0xd9, 0xec, 0xb2, 0xa8, 0x2c, 0x2f, 0xd6, 0xb9, 0x26, 0x55, 0xae, 0x89, 0x60, 0xe4, 0x29, - 0xfc, 0x17, 0x33, 0x26, 0x4a, 0x91, 0xa5, 0xf1, 0xc5, 0x34, 0x11, 0xac, 0x50, 0xe6, 0xf7, 0x69, - 0xbb, 0x6a, 0x9f, 0x0a, 0x56, 0x74, 0x7e, 0x22, 0xa8, 0x07, 0x4b, 0x9e, 0x96, 0x7f, 0x3d, 0xda, - 0x4b, 0x30, 0xe4, 0x3a, 0x4a, 0xbd, 0x7d, 0xf4, 0x64, 0xe7, 0xa6, 0x4a, 0x61, 0xfd, 0x8c, 0xae, - 0xe6, 0x9c, 0xaa, 0x2f, 0xb6, 0xb7, 0xd1, 0xab, 0xdb, 0xdc, 0x0b, 0xc6, 0xb8, 0x1f, 0x4c, 0xe7, - 0x1d, 0xb4, 0x6e, 0x55, 0x48, 0x13, 0x8c, 0xe0, 0x6c, 0x10, 0xe1, 0x1a, 0x69, 0x80, 0x3e, 0x1c, - 0xbe, 0xc5, 0x88, 0x00, 0x98, 0x7d, 0x1a, 0xf4, 0xa2, 0x00, 0x6b, 0xa4, 0x05, 0xf5, 0x71, 0xd4, - 0xa3, 0x11, 0xd6, 0x49, 0x1b, 0x20, 0x38, 0x0b, 0xfa, 0xd3, 0x9e, 0xef, 0x07, 0x3e, 0x36, 0x24, - 0x6d, 0xd4, 0x9b, 0x8c, 0x03, 0x1f, 0xd7, 0x9f, 0xbd, 0x06, 0x73, 0x93, 0xfa, 0x1e, 0x34, 0x26, - 0xe1, 0x9b, 0x70, 0xf8, 0x3e, 0xc4, 0x35, 0x59, 0xac, 0x95, 0x7c, 0x8c, 0x64, 0x41, 0x27, 0x61, - 0x38, 0x08, 0x4f, 0xb1, 0x26, 0x8b, 0x71, 0x34, 0x1c, 0x8d, 0x02, 0x1f, 0xeb, 0x77, 0x94, 0x8c, - 0x13, 0xeb, 0xfa, 0xc6, 0xae, 0x7d, 0xbf, 0xb1, 0x6b, 0x5f, 0x57, 0x36, 0xba, 0x5e, 0xd9, 0xe8, - 0xdb, 0xca, 0x46, 0xbf, 0x56, 0x36, 0x3a, 0x37, 0xd5, 0x4f, 0x70, 0xfc, 0x27, 0x00, 0x00, 0xff, - 0xff, 0xf6, 0xd9, 0x16, 0xff, 0x73, 0x03, 0x00, 0x00, + // 516 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x8b, 0xd3, 0x5c, + 0x14, 0xed, 0x4b, 0xd2, 0xb4, 0xbd, 0x65, 0xfa, 0x3d, 0xde, 0x27, 0x12, 0x47, 0xc8, 0x84, 0x22, + 0x18, 0x04, 0x53, 0xec, 0x6c, 0xdc, 0x76, 0x9a, 0x30, 0x16, 0x31, 0xad, 0xaf, 0x29, 0xce, 0xae, + 0x64, 0x9a, 0x10, 0x9f, 0xcc, 0x24, 0x25, 0x79, 0xad, 0xce, 0xce, 0x9f, 0x37, 0x4b, 0x97, 0xae, + 0xd4, 0xe9, 0x6f, 0xf0, 0x07, 0xc8, 0x7b, 0x69, 0x27, 0x65, 0xa8, 0xe0, 0x26, 0x9c, 0x7b, 0x73, + 0x72, 0xee, 0x3d, 0xe7, 0x12, 0x70, 0x13, 0xc6, 0x3f, 0xae, 0x2e, 0x9d, 0x45, 0x76, 0xdd, 0x5b, + 0x64, 0x29, 0x0f, 0x59, 0x1a, 0xe7, 0xd1, 0x3e, 0x0c, 0x97, 0xac, 0xc7, 0x6f, 0x96, 0x71, 0x51, + 0x35, 0x2b, 0xe4, 0x2c, 0xf3, 0x8c, 0x67, 0xe4, 0xff, 0x8a, 0xef, 0xac, 0x5f, 0x39, 0x92, 0x7e, + 0xfc, 0x28, 0xc9, 0x92, 0x4c, 0xbe, 0xef, 0x09, 0x54, 0x52, 0xbb, 0x9f, 0xa0, 0x35, 0xdc, 0x91, + 0xc9, 0x63, 0x50, 0x58, 0x64, 0x20, 0x0b, 0xd9, 0xad, 0x33, 0x7d, 0xf3, 0xe3, 0x44, 0x19, 0xb9, + 0x54, 0x61, 0x11, 0xc1, 0xa0, 0x2e, 0x59, 0x64, 0x28, 0x16, 0xb2, 0x8f, 0xa8, 0x80, 0xe4, 0x14, + 0xf4, 0x82, 0x87, 0x7c, 0x55, 0x18, 0xaa, 0x85, 0xec, 0x4e, 0xff, 0xa9, 0x73, 0x60, 0xa4, 0x33, + 0x95, 0x14, 0xba, 0xa5, 0x76, 0x7f, 0x23, 0x68, 0x4c, 0xf2, 0x6c, 0x11, 0x17, 0xc5, 0x4e, 0x12, + 0x55, 0x92, 0x04, 0xb4, 0x30, 0x4f, 0x0a, 0x43, 0xb1, 0x54, 0xbb, 0x45, 0x25, 0x16, 0xac, 0x38, + 0x5d, 0x1b, 0xaa, 0x6c, 0x09, 0x48, 0x5e, 0x82, 0xb6, 0x2a, 0xe2, 0xdc, 0xd0, 0x2c, 0x64, 0xb7, + 0xfb, 0x4f, 0x0e, 0x8e, 0x9d, 0x15, 0x71, 0x4e, 0x25, 0x4d, 0x08, 0x2c, 0x3e, 0x47, 0x46, 0x5d, + 0x58, 0xa2, 0x02, 0x92, 0x63, 0x68, 0xf2, 0x38, 0xbf, 0x66, 0x69, 0x78, 0x65, 0xe8, 0x16, 0xb2, + 0x9b, 0xf4, 0xbe, 0x26, 0x27, 0xd0, 0x8e, 0xbf, 0x30, 0x3e, 0xdf, 0x5a, 0x6b, 0xc8, 0xe5, 0x40, + 0xb4, 0x4a, 0x27, 0x7b, 0xb6, 0x9b, 0xff, 0x6e, 0x7b, 0x0a, 0xda, 0x6c, 0xbb, 0xcb, 0xaa, 0xb2, + 0xbc, 0x2a, 0x73, 0x4d, 0xaa, 0x5c, 0x13, 0x16, 0x91, 0xe7, 0xf0, 0x5f, 0x18, 0x45, 0x8c, 0xb3, + 0x2c, 0x0d, 0xaf, 0xe6, 0x09, 0x8b, 0x0a, 0x69, 0xfe, 0x88, 0x76, 0xaa, 0xf6, 0x39, 0x8b, 0x8a, + 0xee, 0x4f, 0x04, 0x75, 0x6f, 0x1d, 0xa7, 0xfc, 0xaf, 0x47, 0x7b, 0x0d, 0x9a, 0x58, 0x47, 0xaa, + 0x77, 0xfa, 0xcf, 0x0e, 0x6e, 0x2a, 0x15, 0xca, 0x67, 0x70, 0xb3, 0x8c, 0xa9, 0xfc, 0x62, 0x77, + 0x1b, 0xb5, 0xba, 0xcd, 0x83, 0x60, 0xb4, 0x87, 0xc1, 0x74, 0xdf, 0x43, 0xeb, 0x5e, 0x85, 0x34, + 0x41, 0xf3, 0x2e, 0x46, 0x01, 0xae, 0x91, 0x06, 0xa8, 0xe3, 0xf1, 0x3b, 0x8c, 0x08, 0x80, 0x3e, + 0xa4, 0xde, 0x20, 0xf0, 0xb0, 0x42, 0x5a, 0x50, 0x9f, 0x06, 0x03, 0x1a, 0x60, 0x95, 0x74, 0x00, + 0xbc, 0x0b, 0x6f, 0x38, 0x1f, 0xb8, 0xae, 0xe7, 0x62, 0x4d, 0xd0, 0x26, 0x83, 0xd9, 0xd4, 0x73, + 0x71, 0xfd, 0xc5, 0x1b, 0xd0, 0xb7, 0xa9, 0xb7, 0xa1, 0x31, 0xf3, 0xdf, 0xfa, 0xe3, 0x0f, 0x3e, + 0xae, 0x89, 0xa2, 0x54, 0x72, 0x31, 0x12, 0x05, 0x9d, 0xf9, 0xfe, 0xc8, 0x3f, 0xc7, 0x8a, 0x28, + 0xa6, 0xc1, 0x78, 0x32, 0xf1, 0x5c, 0xac, 0xee, 0x29, 0x69, 0x67, 0xc6, 0xed, 0x9d, 0x59, 0xfb, + 0x7e, 0x67, 0xd6, 0xbe, 0x6e, 0x4c, 0x74, 0xbb, 0x31, 0xd1, 0xb7, 0x8d, 0x89, 0x7e, 0x6d, 0x4c, + 0x74, 0xa9, 0xcb, 0x9f, 0xe0, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0x66, 0x96, 0xba, + 0x77, 0x03, 0x00, 0x00, } diff --git a/api/types/descriptor/descriptor.pb.go b/api/types/descriptor/descriptor.pb.go index b924742..84bf727 100644 --- a/api/types/descriptor/descriptor.pb.go +++ b/api/types/descriptor/descriptor.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/types/descriptor/descriptor.proto +// source: github.com/containerd/containerd/api/types/descriptor/descriptor.proto // DO NOT EDIT! /* Package descriptor is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/types/descriptor/descriptor.proto + github.com/containerd/containerd/api/types/descriptor/descriptor.proto It has these top-level messages: Descriptor @@ -399,24 +399,24 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/types/descriptor/descriptor.proto", fileDescriptorDescriptor) + proto.RegisterFile("github.com/containerd/containerd/api/types/descriptor/descriptor.proto", fileDescriptorDescriptor) } var fileDescriptorDescriptor = []byte{ - // 231 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4a, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce, - 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c, - 0x48, 0x2d, 0xd6, 0x4f, 0x49, 0x2d, 0x4e, 0x2e, 0xca, 0x2c, 0x28, 0xc9, 0x2f, 0x42, 0x62, 0xea, - 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x23, 0x74, 0xe8, 0x95, 0x19, 0xea, 0x81, 0x35, 0x48, - 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xe5, 0xf5, 0x41, 0x2c, 0x88, 0x52, 0xa5, 0x2e, 0x46, 0x2e, - 0x2e, 0x17, 0xb8, 0x7e, 0x21, 0x19, 0x2e, 0xce, 0xdc, 0xd4, 0x94, 0xcc, 0xc4, 0x90, 0xca, 0x82, - 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x84, 0x80, 0x90, 0x17, 0x17, 0x5b, 0x4a, 0x66, - 0x7a, 0x6a, 0x71, 0x89, 0x04, 0x13, 0x48, 0xca, 0xc9, 0xe8, 0xc4, 0x3d, 0x79, 0x86, 0x5b, 0xf7, - 0xe4, 0xb5, 0x90, 0xdc, 0x9c, 0x5f, 0x90, 0x9a, 0x07, 0xb7, 0xbe, 0x58, 0x3f, 0x3d, 0x5f, 0x17, - 0xa2, 0x45, 0xcf, 0x05, 0x4c, 0x05, 0x41, 0x4d, 0x10, 0x12, 0xe2, 0x62, 0x29, 0xce, 0xac, 0x4a, - 0x95, 0x60, 0x56, 0x60, 0xd4, 0x60, 0x0e, 0x02, 0xb3, 0x9d, 0x24, 0x4e, 0x3c, 0x94, 0x63, 0xb8, - 0xf1, 0x50, 0x8e, 0xa1, 0xe1, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, - 0x3e, 0x78, 0x24, 0xc7, 0x98, 0xc4, 0x06, 0x76, 0xad, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x37, - 0xe8, 0x43, 0x79, 0x1e, 0x01, 0x00, 0x00, + // 225 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4b, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xa7, 0xa4, 0x16, + 0x27, 0x17, 0x65, 0x16, 0x94, 0xe4, 0x17, 0x21, 0x31, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, + 0x84, 0x11, 0x3a, 0xf4, 0xca, 0x0c, 0xf5, 0xc0, 0x1a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, + 0xf2, 0xfa, 0x20, 0x16, 0x44, 0xa9, 0x52, 0x17, 0x23, 0x17, 0x97, 0x0b, 0x5c, 0xbf, 0x90, 0x0c, + 0x17, 0x67, 0x6e, 0x6a, 0x4a, 0x66, 0x62, 0x48, 0x65, 0x41, 0xaa, 0x04, 0xa3, 0x02, 0xa3, 0x06, + 0x67, 0x10, 0x42, 0x40, 0xc8, 0x8b, 0x8b, 0x2d, 0x25, 0x33, 0x3d, 0xb5, 0xb8, 0x44, 0x82, 0x09, + 0x24, 0xe5, 0x64, 0x74, 0xe2, 0x9e, 0x3c, 0xc3, 0xad, 0x7b, 0xf2, 0x5a, 0x48, 0xee, 0xce, 0x2f, + 0x48, 0xcd, 0x83, 0x5b, 0x5f, 0xac, 0x9f, 0x9e, 0xaf, 0x0b, 0xd1, 0xa2, 0xe7, 0x02, 0xa6, 0x82, + 0xa0, 0x26, 0x08, 0x09, 0x71, 0xb1, 0x14, 0x67, 0x56, 0xa5, 0x4a, 0x30, 0x2b, 0x30, 0x6a, 0x30, + 0x07, 0x81, 0xd9, 0x4e, 0x12, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, + 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x4c, 0x62, + 0x03, 0xbb, 0xd6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x18, 0xd2, 0x1a, 0xc3, 0x22, 0x01, 0x00, + 0x00, } diff --git a/api/types/mount/mount.pb.go b/api/types/mount/mount.pb.go index bac88a7..1748f6e 100644 --- a/api/types/mount/mount.pb.go +++ b/api/types/mount/mount.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/api/types/mount/mount.proto +// source: github.com/containerd/containerd/api/types/mount/mount.proto // DO NOT EDIT! /* Package mount is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/api/types/mount/mount.proto + github.com/containerd/containerd/api/types/mount/mount.proto It has these top-level messages: Mount @@ -468,22 +468,22 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/api/types/mount/mount.proto", fileDescriptorMount) + proto.RegisterFile("github.com/containerd/containerd/api/types/mount/mount.proto", fileDescriptorMount) } var fileDescriptorMount = []byte{ - // 204 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce, - 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c, - 0x48, 0x2d, 0xd6, 0xcf, 0xcd, 0x2f, 0xcd, 0x2b, 0x81, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, - 0x42, 0xc2, 0x08, 0x75, 0x7a, 0x65, 0x86, 0x7a, 0x60, 0x65, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, - 0x60, 0x79, 0x7d, 0x10, 0x0b, 0xa2, 0x54, 0x29, 0x95, 0x8b, 0xd5, 0x17, 0xa4, 0x53, 0x48, 0x88, - 0x8b, 0x05, 0xa4, 0x4e, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x16, 0x12, 0xe3, 0x62, - 0x2b, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0x95, 0x60, 0x02, 0x8b, 0x42, 0x79, 0x20, 0xf1, 0x92, 0xc4, - 0xa2, 0xf4, 0xd4, 0x12, 0x09, 0x66, 0x88, 0x38, 0x84, 0x27, 0x24, 0xc1, 0xc5, 0x9e, 0x5f, 0x50, - 0x92, 0x99, 0x9f, 0x57, 0x2c, 0xc1, 0xa2, 0xc0, 0xac, 0xc1, 0x19, 0x04, 0xe3, 0x3a, 0x49, 0x9c, - 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0x43, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, - 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x31, 0x89, 0x0d, 0xec, 0x0e, 0x63, 0x40, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xf3, 0x5c, 0x4b, 0x3a, 0xee, 0x00, 0x00, 0x00, + // 197 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xe6, 0x97, + 0xe6, 0x95, 0x40, 0x48, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x61, 0x84, 0x3a, 0xbd, 0x32, + 0x43, 0x3d, 0xb0, 0x32, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, + 0xaa, 0x94, 0xca, 0xc5, 0xea, 0x0b, 0xd2, 0x29, 0x24, 0xc4, 0xc5, 0x02, 0x52, 0x27, 0xc1, 0xa8, + 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0x66, 0x0b, 0x89, 0x71, 0xb1, 0x15, 0xe7, 0x97, 0x16, 0x25, 0xa7, + 0x4a, 0x30, 0x81, 0x45, 0xa1, 0x3c, 0x90, 0x78, 0x49, 0x62, 0x51, 0x7a, 0x6a, 0x89, 0x04, 0x33, + 0x44, 0x1c, 0xc2, 0x13, 0x92, 0xe0, 0x62, 0xcf, 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x96, 0x60, + 0x51, 0x60, 0xd6, 0xe0, 0x0c, 0x82, 0x71, 0x9d, 0x24, 0x4e, 0x3c, 0x94, 0x63, 0xb8, 0xf1, 0x50, + 0x8e, 0xa1, 0xe1, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, + 0x24, 0xc7, 0x98, 0xc4, 0x06, 0x76, 0x87, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xda, 0x1c, + 0x59, 0xf2, 0x00, 0x00, 0x00, } diff --git a/archive/tar.go b/archive/tar.go index beda2fa..32511c7 100644 --- a/archive/tar.go +++ b/archive/tar.go @@ -14,8 +14,8 @@ import ( "syscall" "time" - "github.com/docker/containerd/fs" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/fs" + "github.com/containerd/containerd/log" "github.com/pkg/errors" ) diff --git a/archive/tar_test.go b/archive/tar_test.go index 8b9ee8d..144cd7f 100644 --- a/archive/tar_test.go +++ b/archive/tar_test.go @@ -10,8 +10,8 @@ import ( _ "crypto/sha256" - "github.com/docker/containerd/fs" - "github.com/docker/containerd/fs/fstest" + "github.com/containerd/containerd/fs" + "github.com/containerd/containerd/fs/fstest" "github.com/pkg/errors" ) diff --git a/archive/tar_windows.go b/archive/tar_windows.go index 543b995..fda7750 100644 --- a/archive/tar_windows.go +++ b/archive/tar_windows.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/docker/containerd/sys" + "github.com/containerd/containerd/sys" ) // tarName returns platform-specific filepath diff --git a/cmd/containerd-shim/main.go b/cmd/containerd-shim/main.go index b7cc6d6..cfdac12 100644 --- a/cmd/containerd-shim/main.go +++ b/cmd/containerd-shim/main.go @@ -11,12 +11,12 @@ import ( "google.golang.org/grpc" "github.com/Sirupsen/logrus" + "github.com/containerd/containerd" + shimapi "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/linux/shim" + "github.com/containerd/containerd/reaper" + "github.com/containerd/containerd/sys" runc "github.com/crosbymichael/go-runc" - "github.com/docker/containerd" - shimapi "github.com/docker/containerd/api/services/shim" - "github.com/docker/containerd/linux/shim" - "github.com/docker/containerd/reaper" - "github.com/docker/containerd/sys" "github.com/urfave/cli" ) diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins.go index 421fe5a..e9ee8ad 100644 --- a/cmd/containerd/builtins.go +++ b/cmd/containerd/builtins.go @@ -2,13 +2,13 @@ package main // register containerd builtins here import ( - _ "github.com/docker/containerd/linux" - _ "github.com/docker/containerd/metrics/cgroups" - _ "github.com/docker/containerd/services/content" - _ "github.com/docker/containerd/services/execution" - _ "github.com/docker/containerd/services/healthcheck" - _ "github.com/docker/containerd/services/metrics" - _ "github.com/docker/containerd/services/rootfs" - _ "github.com/docker/containerd/snapshot/btrfs" - _ "github.com/docker/containerd/snapshot/overlay" + _ "github.com/containerd/containerd/linux" + _ "github.com/containerd/containerd/metrics/cgroups" + _ "github.com/containerd/containerd/services/content" + _ "github.com/containerd/containerd/services/execution" + _ "github.com/containerd/containerd/services/healthcheck" + _ "github.com/containerd/containerd/services/metrics" + _ "github.com/containerd/containerd/services/rootfs" + _ "github.com/containerd/containerd/snapshot/btrfs" + _ "github.com/containerd/containerd/snapshot/overlay" ) diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index 8383952..fa0bffd 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -16,16 +16,16 @@ import ( "google.golang.org/grpc" "github.com/Sirupsen/logrus" - "github.com/docker/containerd" - contentapi "github.com/docker/containerd/api/services/content" - api "github.com/docker/containerd/api/services/execution" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" - "github.com/docker/containerd/reaper" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/sys" + "github.com/containerd/containerd" + contentapi "github.com/containerd/containerd/api/services/content" + api "github.com/containerd/containerd/api/services/execution" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/reaper" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/sys" metrics "github.com/docker/go-metrics" "github.com/pkg/errors" "github.com/urfave/cli" diff --git a/cmd/ctr/delete.go b/cmd/ctr/delete.go index 49a3ac8..4a31d57 100644 --- a/cmd/ctr/delete.go +++ b/cmd/ctr/delete.go @@ -4,7 +4,7 @@ import ( gocontext "context" "errors" - "github.com/docker/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/execution" "github.com/urfave/cli" ) diff --git a/cmd/ctr/events.go b/cmd/ctr/events.go index 5271643..60309e1 100644 --- a/cmd/ctr/events.go +++ b/cmd/ctr/events.go @@ -6,7 +6,7 @@ import ( "os" "text/tabwriter" - "github.com/docker/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/execution" "github.com/urfave/cli" ) diff --git a/cmd/ctr/info.go b/cmd/ctr/info.go index 5ddafea..30fb256 100644 --- a/cmd/ctr/info.go +++ b/cmd/ctr/info.go @@ -6,7 +6,7 @@ import ( gocontext "context" "fmt" - "github.com/docker/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/execution" "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/ctr/list.go b/cmd/ctr/list.go index 9a647c1..597bb20 100644 --- a/cmd/ctr/list.go +++ b/cmd/ctr/list.go @@ -6,7 +6,7 @@ import ( "os" "text/tabwriter" - "github.com/docker/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/execution" "github.com/urfave/cli" ) diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go index d1ed318..8c10a64 100644 --- a/cmd/ctr/main.go +++ b/cmd/ctr/main.go @@ -5,7 +5,7 @@ import ( "os" "github.com/Sirupsen/logrus" - "github.com/docker/containerd" + "github.com/containerd/containerd" "github.com/urfave/cli" ) diff --git a/cmd/ctr/run.go b/cmd/ctr/run.go index ec9279e..d1a4dd8 100644 --- a/cmd/ctr/run.go +++ b/cmd/ctr/run.go @@ -13,10 +13,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" + "github.com/containerd/containerd/api/services/execution" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + "github.com/containerd/containerd/images" "github.com/crosbymichael/console" - "github.com/docker/containerd/api/services/execution" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - "github.com/docker/containerd/images" protobuf "github.com/gogo/protobuf/types" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/shim.go b/cmd/ctr/shim.go index 23ca1c1..9332087 100644 --- a/cmd/ctr/shim.go +++ b/cmd/ctr/shim.go @@ -17,8 +17,8 @@ import ( "google.golang.org/grpc/grpclog" "github.com/Sirupsen/logrus" + "github.com/containerd/containerd/api/services/shim" "github.com/crosbymichael/console" - "github.com/docker/containerd/api/services/shim" protobuf "github.com/gogo/protobuf/types" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/cmd/ctr/utils.go b/cmd/ctr/utils.go index ca41fe2..e727cbf 100644 --- a/cmd/ctr/utils.go +++ b/cmd/ctr/utils.go @@ -15,13 +15,13 @@ import ( gocontext "context" "github.com/boltdb/bolt" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/api/services/execution" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - "github.com/docker/containerd/api/types/container" - "github.com/docker/containerd/content" - "github.com/docker/containerd/images" - contentservice "github.com/docker/containerd/services/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/api/services/execution" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + "github.com/containerd/containerd/api/types/container" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/images" + contentservice "github.com/containerd/containerd/services/content" "github.com/pkg/errors" "github.com/tonistiigi/fifo" "github.com/urfave/cli" diff --git a/cmd/dist/apply.go b/cmd/dist/apply.go index 2dde8a2..a33ce92 100644 --- a/cmd/dist/apply.go +++ b/cmd/dist/apply.go @@ -4,9 +4,9 @@ import ( contextpkg "context" "os" - "github.com/docker/containerd/archive" - "github.com/docker/containerd/archive/compression" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/archive" + "github.com/containerd/containerd/archive/compression" + "github.com/containerd/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/dist/common.go b/cmd/dist/common.go index 461ee6e..ab52816 100644 --- a/cmd/dist/common.go +++ b/cmd/dist/common.go @@ -7,10 +7,10 @@ import ( "time" "github.com/boltdb/bolt" - "github.com/docker/containerd/content" - "github.com/docker/containerd/images" - "github.com/docker/containerd/remotes" - "github.com/docker/containerd/remotes/docker" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/remotes/docker" "github.com/urfave/cli" "google.golang.org/grpc" ) diff --git a/cmd/dist/delete.go b/cmd/dist/delete.go index 3b12c1e..3010952 100644 --- a/cmd/dist/delete.go +++ b/cmd/dist/delete.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/log" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/log" digest "github.com/opencontainers/go-digest" "github.com/urfave/cli" ) diff --git a/cmd/dist/fetch.go b/cmd/dist/fetch.go index 3cb4099..f319b4b 100644 --- a/cmd/dist/fetch.go +++ b/cmd/dist/fetch.go @@ -9,12 +9,12 @@ import ( "text/tabwriter" "time" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/images" - "github.com/docker/containerd/log" - "github.com/docker/containerd/progress" - "github.com/docker/containerd/remotes" - contentservice "github.com/docker/containerd/services/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/progress" + "github.com/containerd/containerd/remotes" + contentservice "github.com/containerd/containerd/services/content" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" "golang.org/x/sync/errgroup" diff --git a/cmd/dist/fetchobject.go b/cmd/dist/fetchobject.go index ca90a8f..c38d4b6 100644 --- a/cmd/dist/fetchobject.go +++ b/cmd/dist/fetchobject.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/dist/get.go b/cmd/dist/get.go index 39a4f10..aef31e1 100644 --- a/cmd/dist/get.go +++ b/cmd/dist/get.go @@ -4,8 +4,8 @@ import ( "io" "os" - contentapi "github.com/docker/containerd/api/services/content" - contentservice "github.com/docker/containerd/services/content" + contentapi "github.com/containerd/containerd/api/services/content" + contentservice "github.com/containerd/containerd/services/content" digest "github.com/opencontainers/go-digest" "github.com/urfave/cli" ) diff --git a/cmd/dist/images.go b/cmd/dist/images.go index fbc1e76..1647855 100644 --- a/cmd/dist/images.go +++ b/cmd/dist/images.go @@ -5,11 +5,11 @@ import ( "os" "text/tabwriter" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/images" - "github.com/docker/containerd/log" - "github.com/docker/containerd/progress" - contentservice "github.com/docker/containerd/services/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/progress" + contentservice "github.com/containerd/containerd/services/content" "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/dist/ingest.go b/cmd/dist/ingest.go index 16a1cef..e20497d 100644 --- a/cmd/dist/ingest.go +++ b/cmd/dist/ingest.go @@ -4,9 +4,9 @@ import ( contextpkg "context" "os" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/content" - contentservice "github.com/docker/containerd/services/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/content" + contentservice "github.com/containerd/containerd/services/content" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/urfave/cli" diff --git a/cmd/dist/list.go b/cmd/dist/list.go index 0a83445..eb8776d 100644 --- a/cmd/dist/list.go +++ b/cmd/dist/list.go @@ -7,8 +7,8 @@ import ( "text/tabwriter" "time" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" "github.com/urfave/cli" diff --git a/cmd/dist/main.go b/cmd/dist/main.go index c3fc54e..5a0ab80 100644 --- a/cmd/dist/main.go +++ b/cmd/dist/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/Sirupsen/logrus" - "github.com/docker/containerd" + "github.com/containerd/containerd" "github.com/urfave/cli" ) diff --git a/cmd/dist/pull.go b/cmd/dist/pull.go index 82423f8..f00ca69 100644 --- a/cmd/dist/pull.go +++ b/cmd/dist/pull.go @@ -7,15 +7,15 @@ import ( "text/tabwriter" "time" - contentapi "github.com/docker/containerd/api/services/content" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - "github.com/docker/containerd/content" - "github.com/docker/containerd/images" - "github.com/docker/containerd/log" - "github.com/docker/containerd/progress" - "github.com/docker/containerd/remotes" - contentservice "github.com/docker/containerd/services/content" - rootfsservice "github.com/docker/containerd/services/rootfs" + contentapi "github.com/containerd/containerd/api/services/content" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/progress" + "github.com/containerd/containerd/remotes" + contentservice "github.com/containerd/containerd/services/content" + rootfsservice "github.com/containerd/containerd/services/rootfs" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/dist/rootfs.go b/cmd/dist/rootfs.go index cd2378f..9634100 100644 --- a/cmd/dist/rootfs.go +++ b/cmd/dist/rootfs.go @@ -8,12 +8,12 @@ import ( "os" "strings" - contentapi "github.com/docker/containerd/api/services/content" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" - contentservice "github.com/docker/containerd/services/content" - rootfsservice "github.com/docker/containerd/services/rootfs" + contentapi "github.com/containerd/containerd/api/services/content" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" + contentservice "github.com/containerd/containerd/services/content" + rootfsservice "github.com/containerd/containerd/services/rootfs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/content/content_test.go b/content/content_test.go index 5063fca..35f7256 100644 --- a/content/content_test.go +++ b/content/content_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/docker/containerd/testutil" + "github.com/containerd/containerd/testutil" "github.com/opencontainers/go-digest" ) diff --git a/content/store.go b/content/store.go index 9fc260d..4a3a676 100644 --- a/content/store.go +++ b/content/store.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/log" "github.com/nightlyone/lockfile" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/content/writer.go b/content/writer.go index 2f72021..e27bd09 100644 --- a/content/writer.go +++ b/content/writer.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/log" "github.com/nightlyone/lockfile" "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/design/snapshots.md b/design/snapshots.md index 6853783..625c62b 100644 --- a/design/snapshots.md +++ b/design/snapshots.md @@ -105,7 +105,7 @@ If the user wants to discard committed snapshots, the _remove_ operation can also be used, but any children must be removed before proceeding. For detailed usage information, see the -[GoDoc](https://godoc.org/github.com/docker/containerd/snapshot#Snapshotter). +[GoDoc](https://godoc.org/github.com/containerd/containerd/snapshot#Snapshotter). ### Graph metadata diff --git a/docs/_includes/links.html b/docs/_includes/links.html index ee95ea1..6e2d07e 100644 --- a/docs/_includes/links.html +++ b/docs/_includes/links.html @@ -1,3 +1,3 @@
- +
diff --git a/docs/index.md b/docs/index.md index 66d5acc..0fcc0c1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -16,7 +16,7 @@ containerd is an industry-standard core container runtime with an emphasis on si containerd is designed to be embedded into a larger system, rather than being used directly by developers or end-users. -containerd includes a daemon exposing gRPC API over a local UNIX socket. The API is a low-level one designed for higher layers to wrap and extend. It also includes a barebone CLI (`ctr`) designed specifically for development and debugging purpose. It uses [runC](https://github.com/opencontainers/runc) to run containers according to the [OCI specification](https://www.opencontainers.org/about). The code can be found on [GitHub](https://github.com/docker/containerd), and here are the [contribution guidelines](https://github.com/docker/containerd/blob/master/CONTRIBUTING.md). +containerd includes a daemon exposing gRPC API over a local UNIX socket. The API is a low-level one designed for higher layers to wrap and extend. It also includes a barebone CLI (`ctr`) designed specifically for development and debugging purpose. It uses [runC](https://github.com/opencontainers/runc) to run containers according to the [OCI specification](https://www.opencontainers.org/about). The code can be found on [GitHub](https://github.com/containerd/containerd), and here are the [contribution guidelines](https://github.com/containerd/containerd/blob/master/CONTRIBUTING.md). containerd is based on the Docker Engine’s core container runtime to benefit from its maturity and existing contributors. @@ -32,13 +32,13 @@ containerd is based on the Docker Engine’s core container runtime to benefit f * Management of network namespaces containers to join existing namespaces * Multi-tenant supported with CAS storage for global images -containerd, currently in [version 0.2.4](https://github.com/docker/containerd/releases/tag/v0.2.4), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd will graduate to version 1.0 once its feature scope matches the requirements above, from which it will commit to API stability as well as committing to a 1-year LTS release. Docker Engine commits to upgrading to containerd 1.0 as part of its regular release cycle. +containerd, currently in [version 0.2.4](https://github.com/containerd/containerd/releases/tag/v0.2.4), is a daemon born from extracting the container execution subset of the Docker Engine, and is [used internally by Docker since the 1.11 release](https://blog.docker.com/2016/04/docker-engine-1-11-runc/). containerd will graduate to version 1.0 once its feature scope matches the requirements above, from which it will commit to API stability as well as committing to a 1-year LTS release. Docker Engine commits to upgrading to containerd 1.0 as part of its regular release cycle. -[containerd roadmap](https://github.com/docker/containerd/blob/master/ROADMAP.md) to implement these features is described in the containerd Github repository. +[containerd roadmap](https://github.com/containerd/containerd/blob/master/ROADMAP.md) to implement these features is described in the containerd Github repository. ## Architecture -Containerd [architecture](https://github.com/docker/containerd/blob/master/design/architecture.md) and [API](https://github.com/docker/containerd/tree/master/api/) are described in the Github repository. +Containerd [architecture](https://github.com/containerd/containerd/blob/master/design/architecture.md) and [API](https://github.com/containerd/containerd/tree/master/api/) are described in the Github repository. ![Containerd Architecture](/images/chart-b.png "Containerd High Level Architecture") diff --git a/events/poster.go b/events/poster.go index 2628012..dca077b 100644 --- a/events/poster.go +++ b/events/poster.go @@ -4,7 +4,7 @@ import ( "context" "github.com/Sirupsen/logrus" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/log" ) var ( diff --git a/fs/copy_test.go b/fs/copy_test.go index 0e7cac0..816de8f 100644 --- a/fs/copy_test.go +++ b/fs/copy_test.go @@ -6,7 +6,7 @@ import ( _ "crypto/sha256" - "github.com/docker/containerd/fs/fstest" + "github.com/containerd/containerd/fs/fstest" "github.com/pkg/errors" ) diff --git a/fs/diff_test.go b/fs/diff_test.go index bee0044..6ab6ac3 100644 --- a/fs/diff_test.go +++ b/fs/diff_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/docker/containerd/fs/fstest" + "github.com/containerd/containerd/fs/fstest" "github.com/pkg/errors" ) diff --git a/images/handlers.go b/images/handlers.go index 0bd471d..bb7bfa7 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/docker/containerd/content" + "github.com/containerd/containerd/content" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/images/image.go b/images/image.go index cdbf61d..3ffc056 100644 --- a/images/image.go +++ b/images/image.go @@ -6,8 +6,8 @@ import ( "errors" "io/ioutil" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/storage.go b/images/storage.go index 050addb..9cb124b 100644 --- a/images/storage.go +++ b/images/storage.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/boltdb/bolt" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/linux/container.go b/linux/container.go index c5f64d1..7ad5c09 100644 --- a/linux/container.go +++ b/linux/container.go @@ -1,9 +1,9 @@ package linux import ( - "github.com/docker/containerd" - "github.com/docker/containerd/api/services/shim" - "github.com/docker/containerd/api/types/container" + "github.com/containerd/containerd" + "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/types/container" "golang.org/x/net/context" ) diff --git a/linux/runtime.go b/linux/runtime.go index ff9c396..b107137 100644 --- a/linux/runtime.go +++ b/linux/runtime.go @@ -9,12 +9,12 @@ import ( "path/filepath" "time" - "github.com/docker/containerd" - "github.com/docker/containerd/api/services/shim" - "github.com/docker/containerd/api/types/container" - "github.com/docker/containerd/api/types/mount" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" + "github.com/containerd/containerd" + "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/types/container" + "github.com/containerd/containerd/api/types/mount" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" "golang.org/x/net/context" ) diff --git a/linux/shim.go b/linux/shim.go index 32f28c2..d5df4e3 100644 --- a/linux/shim.go +++ b/linux/shim.go @@ -13,10 +13,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/grpclog" - "github.com/docker/containerd/api/services/shim" - localShim "github.com/docker/containerd/linux/shim" - "github.com/docker/containerd/reaper" - "github.com/docker/containerd/sys" + "github.com/containerd/containerd/api/services/shim" + localShim "github.com/containerd/containerd/linux/shim" + "github.com/containerd/containerd/reaper" + "github.com/containerd/containerd/sys" "github.com/pkg/errors" ) diff --git a/linux/shim/client.go b/linux/shim/client.go index 2e190aa..858dccb 100644 --- a/linux/shim/client.go +++ b/linux/shim/client.go @@ -4,8 +4,8 @@ import ( "path/filepath" "syscall" - shimapi "github.com/docker/containerd/api/services/shim" - "github.com/docker/containerd/api/types/container" + shimapi "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/types/container" google_protobuf "github.com/golang/protobuf/ptypes/empty" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/linux/shim/exec.go b/linux/shim/exec.go index 5328a6e..02de62c 100644 --- a/linux/shim/exec.go +++ b/linux/shim/exec.go @@ -10,9 +10,9 @@ import ( "sync" "syscall" + shimapi "github.com/containerd/containerd/api/services/shim" "github.com/crosbymichael/console" runc "github.com/crosbymichael/go-runc" - shimapi "github.com/docker/containerd/api/services/shim" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/tonistiigi/fifo" ) diff --git a/linux/shim/init.go b/linux/shim/init.go index d11669b..5f3c2c4 100644 --- a/linux/shim/init.go +++ b/linux/shim/init.go @@ -8,10 +8,10 @@ import ( "sync" "syscall" + "github.com/containerd/containerd" + shimapi "github.com/containerd/containerd/api/services/shim" "github.com/crosbymichael/console" runc "github.com/crosbymichael/go-runc" - "github.com/docker/containerd" - shimapi "github.com/docker/containerd/api/services/shim" "github.com/tonistiigi/fifo" ) diff --git a/linux/shim/service.go b/linux/shim/service.go index 4d7d61c..ffad811 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -6,10 +6,10 @@ import ( "syscall" "github.com/Sirupsen/logrus" + shimapi "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/types/container" + "github.com/containerd/containerd/reaper" "github.com/crosbymichael/console" - shimapi "github.com/docker/containerd/api/services/shim" - "github.com/docker/containerd/api/types/container" - "github.com/docker/containerd/reaper" google_protobuf "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" "golang.org/x/net/context" diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index 475fd8d..32e28ad 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -1,10 +1,10 @@ package cgroups import ( + "github.com/containerd/containerd" + "github.com/containerd/containerd/plugin" "github.com/crosbymichael/cgroups" "github.com/crosbymichael/cgroups/prometheus" - "github.com/docker/containerd" - "github.com/docker/containerd/plugin" metrics "github.com/docker/go-metrics" "golang.org/x/net/context" ) diff --git a/plugin/monitor.go b/plugin/monitor.go index 1b4ccdf..a5f55d5 100644 --- a/plugin/monitor.go +++ b/plugin/monitor.go @@ -1,6 +1,6 @@ package plugin -import "github.com/docker/containerd" +import "github.com/containerd/containerd" // ContainerMonitor provides an interface for monitoring of containers within containerd type ContainerMonitor interface { diff --git a/plugin/plugin.go b/plugin/plugin.go index 1b0b958..96a8c07 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/docker/containerd" - "github.com/docker/containerd/content" - "github.com/docker/containerd/snapshot" + "github.com/containerd/containerd" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/snapshot" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/reaper/reaper.go b/reaper/reaper.go index 43cb2ed..2338e9f 100644 --- a/reaper/reaper.go +++ b/reaper/reaper.go @@ -6,7 +6,7 @@ import ( "os/exec" "sync" - "github.com/docker/containerd/sys" + "github.com/containerd/containerd/sys" ) // Reap should be called when the process receives an SIGCHLD. Reap will reap diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index f3bc509..985d885 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/containerd/images" - "github.com/docker/containerd/log" - "github.com/docker/containerd/reference" - "github.com/docker/containerd/remotes" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/remotes" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/remotes/handlers.go b/remotes/handlers.go index c6084b3..ec95511 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/Sirupsen/logrus" - "github.com/docker/containerd/content" - "github.com/docker/containerd/images" - "github.com/docker/containerd/log" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/reports/2017-01-13.md b/reports/2017-01-13.md index 9bc10b8..c9f8efe 100644 --- a/reports/2017-01-13.md +++ b/reports/2017-01-13.md @@ -8,8 +8,8 @@ I wanted to try something different for this project during its development by g This week we merged PRs adding a quick start guide with build instructions to help get new contributors onboard quicker. We also merged a vendoring PR so everyone has the same revision of packages for the project. It can add a little burden on development having vendoring at this early stage, especially the way we have to do vendoring in Go, but it ensures that everyone contributing has a consistent environment. -* https://github.com/docker/containerd/pull/400 -* https://github.com/docker/containerd/pull/390 +* https://github.com/containerd/containerd/pull/400 +* https://github.com/containerd/containerd/pull/390 ## Milestones @@ -19,7 +19,7 @@ We are currently in the bootstrap phase. Much of the design work, getting the p The milestones will give you the most up-to-date view on the project and what is being worked on when. -* https://github.com/docker/containerd/milestones +* https://github.com/containerd/containerd/milestones ## Networking @@ -29,18 +29,18 @@ Networking means many different things today and is becoming more software based I personally feel like this is a good move for the project. We have good primitives at the runtime level with the create/start split that allows a container's network namespace to be created and time for a network plugin to create and add interfaces to the container before the user's process is started. We also have the ability for containers to join pre-existing network namespaces that have already been populated by a networking implementation. -* https://github.com/docker/containerd/issues/362 +* https://github.com/containerd/containerd/issues/362 ## Runtime and Shim We finished porting over the shim from the existing containerd implementation that is being used today. This makes sure that the containers are not tied to the daemon's lifecycle. This allows containerd to reattach to the STDIO and receive exit events for the containers when it is no longer the parent of these processes. -* https://github.com/docker/containerd/pull/417 +* https://github.com/containerd/containerd/pull/417 ## Whats Next? Next week we will be working towards a full PoC with the runtime, storage, and fetching of images. Getting the core functionality up and running quickly is important to us to ensure that integration between the different subsystems in the core flow well together. We want to make sure the responsibilities of pulling an image from a remote source do not spill into the storage layer and vice-versa. -We still have more documentation work to do on the design and lifecycle of components in the core which is another focus for next week. You can find the current design docs in the [repo here](https://github.com/docker/containerd/tree/master/design). +We still have more documentation work to do on the design and lifecycle of components in the core which is another focus for next week. You can find the current design docs in the [repo here](https://github.com/containerd/containerd/tree/master/design). I hope this status report helps. If you are looking for ways to contribute, check out the issues on the current milestone. diff --git a/reports/2017-01-20.md b/reports/2017-01-20.md index 3b1ceea..cb0836c 100644 --- a/reports/2017-01-20.md +++ b/reports/2017-01-20.md @@ -6,7 +6,7 @@ This week we worked on refactoring the storage and runtime aspects of containerd @stevvooe started work on a `dist` tool for fetching images and other distribution aspects. One of the problems we wanted to solve with containerd is the ability to decouple the fetch of image contents, the unpacking of the contents, and the storage of the contents. Separating these lets us download content as non-root on machines and only elevate privileges when the contents need to be unpacked on disk. -* https://github.com/docker/containerd/pull/452 +* https://github.com/containerd/containerd/pull/452 ## Shim Work diff --git a/reports/2017-01-27.md b/reports/2017-01-27.md index c9438c3..f8d8c1d 100644 --- a/reports/2017-01-27.md +++ b/reports/2017-01-27.md @@ -9,7 +9,7 @@ container-shim, which is used for robust container management. ## Maintainers -* https://github.com/docker/containerd/pull/473 +* https://github.com/containerd/containerd/pull/473 Derek McGowan will be joining the containerd team as a maintainer. His extensive experience in graphdrivers and distribution will be invaluable to the @@ -17,7 +17,7 @@ containerd project. ## Shim over GRPC -* https://github.com/docker/containerd/pull/462 +* https://github.com/containerd/containerd/pull/462 ``` NAME: @@ -86,9 +86,9 @@ events, start containers, start exec processes. ## Distribution Tool -* https://github.com/docker/containerd/pull/452 -* https://github.com/docker/containerd/pull/472 -* https://github.com/docker/containerd/pull/474 +* https://github.com/containerd/containerd/pull/452 +* https://github.com/containerd/containerd/pull/472 +* https://github.com/containerd/containerd/pull/474 Last week, @stevvooe committed the first parts of the distribution tool. The main component provided there was the `dist fetch` command. This has been followed @@ -221,7 +221,7 @@ To get access to the layers, you can use the path command: ``` $./dist path sha256:010c454d55e53059beaba4044116ea4636f8dd8181e975d893931c7e7204fffa -sha256:010c454d55e53059beaba4044116ea4636f8dd8181e975d893931c7e7204fffa /home/sjd/go/src/github.com/docker/containerd/.content/blobs/sha256/010c454d55e53059beaba4044116ea4636f8dd8181e975d893931c7e7204fffa +sha256:010c454d55e53059beaba4044116ea4636f8dd8181e975d893931c7e7204fffa /home/sjd/go/src/github.com/containerd/containerd/.content/blobs/sha256/010c454d55e53059beaba4044116ea4636f8dd8181e975d893931c7e7204fffa ``` This returns the a direct path to the blob to facilitate fast access. We can diff --git a/reports/2017-02-10.md b/reports/2017-02-10.md index d2238cd..fea529c 100644 --- a/reports/2017-02-10.md +++ b/reports/2017-02-10.md @@ -5,7 +5,7 @@ This week we will go over what happened last week and this week. ## Snapshot Design Changes -* https://github.com/docker/containerd/pull/496 +* https://github.com/containerd/containerd/pull/496 After receiving feedback on the `snapshot.Driver` interface, now known as the `Snapshotter`, it was found that the behavior of active and committed snapshots diff --git a/reports/2017-02-24.md b/reports/2017-02-24.md index 25f446b..b9fe844 100644 --- a/reports/2017-02-24.md +++ b/reports/2017-02-24.md @@ -46,7 +46,7 @@ These are just simple examples and much of the format will be left up to the cli Looking at the latest Go 1.8 release plugins looked like a perfect solution for extending containerd by third parties. However, after discussions at the summit and with help from Tim to get clarification on the feature from the Go team it does not not look very promising in terms of implementation. We currently have the code for plugins via go 1.8 merged into master but we will have to rethink our extension method going forward. -https://github.com/docker/containerd/issues/563 +https://github.com/containerd/containerd/issues/563 ## Storage and Distribution Breakout Session diff --git a/reports/2017-03-10.md b/reports/2017-03-10.md index ff12629..de7409e 100644 --- a/reports/2017-03-10.md +++ b/reports/2017-03-10.md @@ -19,11 +19,11 @@ package main // register containerd builtins here import ( - _ "github.com/docker/containerd/linux" - _ "github.com/docker/containerd/services/content" - _ "github.com/docker/containerd/services/execution" - _ "github.com/docker/containerd/snapshot/btrfs" - _ "github.com/docker/containerd/snapshot/overlay" + _ "github.com/containerd/containerd/linux" + _ "github.com/containerd/containerd/services/content" + _ "github.com/containerd/containerd/services/execution" + _ "github.com/containerd/containerd/snapshot/btrfs" + _ "github.com/containerd/containerd/snapshot/overlay" ) ``` diff --git a/reports/2017-03-17.md b/reports/2017-03-17.md index 11ea7ae..cbd821b 100644 --- a/reports/2017-03-17.md +++ b/reports/2017-03-17.md @@ -6,7 +6,7 @@ Thanks to @gianarb for starting the discussion around a test and CI plan for con Testing a project like containerd is always a challenge because of the systems that it needs to support. ARM, Windows, Linux, and Power (as well as many more variations) are all examples of platforms that we support today and will need a CI. -You can view the issue and contribute to the testing plan [here](https://github.com/docker/containerd/issues/634). +You can view the issue and contribute to the testing plan [here](https://github.com/containerd/containerd/issues/634). ## Windows Runtime @@ -104,7 +104,7 @@ There should be a PR up soon so that we can discuss the metrics and label names. ## Image Pull -* https://github.com/docker/containerd/pull/640 +* https://github.com/containerd/containerd/pull/640 We now have a proof of concept of end to end pull. Up to this point, the relationship between subsystems has been somewhat theoretical. We now leverage diff --git a/reports/2017-03-24.md b/reports/2017-03-24.md index e201ff9..fa9e4f7 100644 --- a/reports/2017-03-24.md +++ b/reports/2017-03-24.md @@ -2,7 +2,7 @@ ## Container Level Metrics -* https://github.com/docker/containerd/pull/646 +* https://github.com/containerd/containerd/pull/646 We merged a PR to add our first pass of container level metrics to our prometheus output in containerd. We still have to review the metric names and @@ -18,7 +18,7 @@ and figure out where the implementation gaps are. ### Image to OCI Spec -* https://github.com/docker/containerd/pull/660 +* https://github.com/containerd/containerd/pull/660 We merged support for getting an image config that was pulled off of a registry and generating a spec based on the image properties in the `ctr` command. This @@ -39,7 +39,7 @@ sudo ctr run --id redis -t docker.io/library/redis:alpine ### Image handlers -* https://github.com/docker/containerd/pull/638 +* https://github.com/containerd/containerd/pull/638 We refactored the fetch command into a more generic image handler interface. As we look forward to supporting the full oci image spec as well as the Docker @@ -56,7 +56,7 @@ docker.io/library/redis:latest application/vnd.docker.distribution.manif ## Snapshot driver improvements -* https://github.com/docker/containerd/pull/635 +* https://github.com/containerd/containerd/pull/635 The `overlay` and `btrfs` driver implementations are now fully implemented and share an implementation for metadata storage. This new metadata storage package diff --git a/rootfs/apply.go b/rootfs/apply.go index e29e9f4..8dba3e0 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -5,11 +5,11 @@ import ( "io" "io/ioutil" - "github.com/docker/containerd" - "github.com/docker/containerd/archive" - "github.com/docker/containerd/archive/compression" - "github.com/docker/containerd/log" - "github.com/docker/containerd/snapshot" + "github.com/containerd/containerd" + "github.com/containerd/containerd/archive" + "github.com/containerd/containerd/archive/compression" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/snapshot" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/rootfs/init.go b/rootfs/init.go index 4acbf7e..076ed6e 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -6,9 +6,9 @@ import ( "io/ioutil" "os" - "github.com/docker/containerd" - "github.com/docker/containerd/log" - "github.com/docker/containerd/snapshot" + "github.com/containerd/containerd" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/snapshot" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/services/content/helpers.go b/services/content/helpers.go index 6de84f1..7065981 100644 --- a/services/content/helpers.go +++ b/services/content/helpers.go @@ -1,7 +1,7 @@ package content import ( - "github.com/docker/containerd/content" + "github.com/containerd/containerd/content" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/services/content/ingester.go b/services/content/ingester.go index cd67100..191626b 100644 --- a/services/content/ingester.go +++ b/services/content/ingester.go @@ -4,8 +4,8 @@ import ( "context" "io" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/content" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/services/content/provider.go b/services/content/provider.go index b8c1aac..af7995a 100644 --- a/services/content/provider.go +++ b/services/content/provider.go @@ -4,8 +4,8 @@ import ( "context" "io" - contentapi "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/content" + contentapi "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/content" digest "github.com/opencontainers/go-digest" ) diff --git a/services/content/service.go b/services/content/service.go index 6286fca..c311124 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -5,10 +5,10 @@ import ( "sync" "github.com/Sirupsen/logrus" - api "github.com/docker/containerd/api/services/content" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" + api "github.com/containerd/containerd/api/services/content" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" "github.com/golang/protobuf/ptypes/empty" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/services/execution/collector.go b/services/execution/collector.go index b8ed395..cd44f24 100644 --- a/services/execution/collector.go +++ b/services/execution/collector.go @@ -3,7 +3,7 @@ package execution import ( "sync" - "github.com/docker/containerd" + "github.com/containerd/containerd" "golang.org/x/net/context" ) diff --git a/services/execution/service.go b/services/execution/service.go index 4e9761d..aa55979 100644 --- a/services/execution/service.go +++ b/services/execution/service.go @@ -3,11 +3,11 @@ package execution import ( "sync" - "github.com/docker/containerd" - api "github.com/docker/containerd/api/services/execution" - "github.com/docker/containerd/api/types/container" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" + "github.com/containerd/containerd" + api "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/types/container" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" google_protobuf "github.com/golang/protobuf/ptypes/empty" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/services/healthcheck/service.go b/services/healthcheck/service.go index 181eb5d..4202c15 100644 --- a/services/healthcheck/service.go +++ b/services/healthcheck/service.go @@ -1,7 +1,7 @@ package healthcheck import ( - "github.com/docker/containerd/plugin" + "github.com/containerd/containerd/plugin" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/services/metrics/metrics.go b/services/metrics/metrics.go index f87c86b..73e4b40 100644 --- a/services/metrics/metrics.go +++ b/services/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/docker/containerd/plugin" + "github.com/containerd/containerd/plugin" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" ) diff --git a/services/rootfs/preparer.go b/services/rootfs/preparer.go index 82408d8..baeb194 100644 --- a/services/rootfs/preparer.go +++ b/services/rootfs/preparer.go @@ -3,9 +3,9 @@ package rootfs import ( "context" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - containerd_v1_types "github.com/docker/containerd/api/types/descriptor" - "github.com/docker/containerd/rootfs" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + containerd_v1_types "github.com/containerd/containerd/api/types/descriptor" + "github.com/containerd/containerd/rootfs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/rootfs/service.go b/services/rootfs/service.go index b82a1fc..146c13c 100644 --- a/services/rootfs/service.go +++ b/services/rootfs/service.go @@ -3,14 +3,14 @@ package rootfs import ( "syscall" - "github.com/docker/containerd" - rootfsapi "github.com/docker/containerd/api/services/rootfs" - containerd_v1_types "github.com/docker/containerd/api/types/mount" - "github.com/docker/containerd/content" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" - "github.com/docker/containerd/rootfs" - "github.com/docker/containerd/snapshot" + "github.com/containerd/containerd" + rootfsapi "github.com/containerd/containerd/api/services/rootfs" + containerd_v1_types "github.com/containerd/containerd/api/types/mount" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/rootfs" + "github.com/containerd/containerd/snapshot" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/net/context" diff --git a/snapshot/btrfs/btrfs.go b/snapshot/btrfs/btrfs.go index ab0904d..d74d2fd 100644 --- a/snapshot/btrfs/btrfs.go +++ b/snapshot/btrfs/btrfs.go @@ -7,12 +7,12 @@ import ( "path/filepath" "github.com/Sirupsen/logrus" - "github.com/docker/containerd" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage" - "github.com/docker/containerd/snapshot/storage/boltdb" + "github.com/containerd/containerd" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot/storage/boltdb" "github.com/pkg/errors" "github.com/stevvooe/go-btrfs" ) diff --git a/snapshot/btrfs/btrfs_test.go b/snapshot/btrfs/btrfs_test.go index 9b90b7d..9b4f5ee 100644 --- a/snapshot/btrfs/btrfs_test.go +++ b/snapshot/btrfs/btrfs_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "github.com/docker/containerd" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage/boltdb" - "github.com/docker/containerd/snapshot/testsuite" - "github.com/docker/containerd/testutil" + "github.com/containerd/containerd" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage/boltdb" + "github.com/containerd/containerd/snapshot/testsuite" + "github.com/containerd/containerd/testutil" ) const ( diff --git a/snapshot/naive/naive.go b/snapshot/naive/naive.go index 9099d2b..1f495df 100644 --- a/snapshot/naive/naive.go +++ b/snapshot/naive/naive.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/docker/containerd" - "github.com/docker/containerd/fs" + "github.com/containerd/containerd" + "github.com/containerd/containerd/fs" "github.com/pkg/errors" ) diff --git a/snapshot/naive/naive_test.go b/snapshot/naive/naive_test.go index 144fcf1..390c1c0 100644 --- a/snapshot/naive/naive_test.go +++ b/snapshot/naive/naive_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/docker/containerd" - "github.com/docker/containerd/testutil" + "github.com/containerd/containerd" + "github.com/containerd/containerd/testutil" ) func TestSnapshotNaiveBasic(t *testing.T) { diff --git a/snapshot/overlay/overlay.go b/snapshot/overlay/overlay.go index 456b5e8..d202672 100644 --- a/snapshot/overlay/overlay.go +++ b/snapshot/overlay/overlay.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "github.com/docker/containerd" - "github.com/docker/containerd/log" - "github.com/docker/containerd/plugin" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage" - "github.com/docker/containerd/snapshot/storage/boltdb" + "github.com/containerd/containerd" + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot/storage/boltdb" "github.com/pkg/errors" ) diff --git a/snapshot/overlay/overlay_test.go b/snapshot/overlay/overlay_test.go index 3417760..86ef168 100644 --- a/snapshot/overlay/overlay_test.go +++ b/snapshot/overlay/overlay_test.go @@ -9,11 +9,11 @@ import ( "syscall" "testing" - "github.com/docker/containerd" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage/boltdb" - "github.com/docker/containerd/snapshot/testsuite" - "github.com/docker/containerd/testutil" + "github.com/containerd/containerd" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage/boltdb" + "github.com/containerd/containerd/snapshot/testsuite" + "github.com/containerd/containerd/testutil" ) func boltSnapshotter(ctx context.Context, root string) (snapshot.Snapshotter, func(), error) { diff --git a/snapshot/snapshotter.go b/snapshot/snapshotter.go index 5bd2620..11735f8 100644 --- a/snapshot/snapshotter.go +++ b/snapshot/snapshotter.go @@ -3,7 +3,7 @@ package snapshot import ( "context" - "github.com/docker/containerd" + "github.com/containerd/containerd" ) // Kind identifies the kind of snapshot. diff --git a/snapshot/storage/boltdb/bolt.go b/snapshot/storage/boltdb/bolt.go index 9219bf1..41914e7 100644 --- a/snapshot/storage/boltdb/bolt.go +++ b/snapshot/storage/boltdb/bolt.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/boltdb/bolt" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ) diff --git a/snapshot/storage/boltdb/bolt_test.go b/snapshot/storage/boltdb/bolt_test.go index b204ee2..81c2dd5 100644 --- a/snapshot/storage/boltdb/bolt_test.go +++ b/snapshot/storage/boltdb/bolt_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "github.com/docker/containerd/snapshot/storage" - "github.com/docker/containerd/snapshot/storage/testsuite" + "github.com/containerd/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot/storage/testsuite" // Does not require root but flag must be defined for snapshot tests - _ "github.com/docker/containerd/testutil" + _ "github.com/containerd/containerd/testutil" ) func TestBoltDB(t *testing.T) { diff --git a/snapshot/storage/boltdb/record.pb.go b/snapshot/storage/boltdb/record.pb.go index cb6bb2d..3d2cfd2 100644 --- a/snapshot/storage/boltdb/record.pb.go +++ b/snapshot/storage/boltdb/record.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/docker/containerd/snapshot/storage/boltdb/record.proto +// source: github.com/containerd/containerd/snapshot/storage/boltdb/record.proto // DO NOT EDIT! /* Package boltdb is a generated protocol buffer package. It is generated from these files: - github.com/docker/containerd/snapshot/storage/boltdb/record.proto + github.com/containerd/containerd/snapshot/storage/boltdb/record.proto It has these top-level messages: Snapshot @@ -440,29 +440,29 @@ var ( ) func init() { - proto.RegisterFile("github.com/docker/containerd/snapshot/storage/boltdb/record.proto", fileDescriptorRecord) + proto.RegisterFile("github.com/containerd/containerd/snapshot/storage/boltdb/record.proto", fileDescriptorRecord) } var fileDescriptorRecord = []byte{ - // 314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xcf, 0x4a, 0xf3, 0x40, - 0x14, 0xc5, 0x33, 0x21, 0x5f, 0x68, 0x87, 0xaf, 0xa5, 0x46, 0x29, 0x21, 0x8b, 0x71, 0x70, 0x63, - 0x70, 0x91, 0x41, 0x7d, 0x82, 0xfe, 0x5b, 0x94, 0x52, 0x84, 0x58, 0xdc, 0x27, 0x99, 0x21, 0x1d, - 0xda, 0xce, 0x2d, 0xd3, 0xb1, 0xe0, 0x4a, 0x97, 0xd2, 0x77, 0xe8, 0x4a, 0x9f, 0xc2, 0x27, 0xe8, - 0xd2, 0xa5, 0x2b, 0xb1, 0x79, 0x12, 0x69, 0x5a, 0x14, 0x77, 0xf7, 0xdc, 0xf3, 0xbb, 0xe7, 0x72, - 0x70, 0x2b, 0x97, 0x66, 0x7c, 0x9f, 0x46, 0x19, 0xcc, 0x18, 0x87, 0x6c, 0x22, 0x34, 0xcb, 0x40, - 0x99, 0x44, 0x2a, 0xa1, 0x39, 0x5b, 0xa8, 0x64, 0xbe, 0x18, 0x83, 0x61, 0x0b, 0x03, 0x3a, 0xc9, - 0x05, 0x4b, 0x61, 0x6a, 0x78, 0xca, 0xb4, 0xc8, 0x40, 0xf3, 0x68, 0xae, 0xc1, 0x80, 0x57, 0xfb, - 0x3d, 0x88, 0x96, 0x97, 0xc1, 0x49, 0x0e, 0x39, 0x94, 0x0e, 0xdb, 0x4d, 0x7b, 0xe8, 0xec, 0x11, - 0x57, 0x6e, 0x0f, 0x61, 0x5e, 0x13, 0xdb, 0x92, 0xfb, 0x88, 0xa2, 0xd0, 0x69, 0xbb, 0xc5, 0xe7, - 0xa9, 0xdd, 0xef, 0xc6, 0xb6, 0xe4, 0x5e, 0x13, 0xbb, 0xf3, 0x44, 0x0b, 0x65, 0x7c, 0x9b, 0xa2, - 0xb0, 0x1a, 0x1f, 0x94, 0x77, 0x8e, 0x9d, 0x89, 0x54, 0xdc, 0x77, 0x28, 0x0a, 0xeb, 0x57, 0xc7, - 0xd1, 0x9f, 0x7f, 0xd1, 0x40, 0x2a, 0x1e, 0x97, 0x80, 0x17, 0xe0, 0x8a, 0x16, 0x09, 0x07, 0x35, - 0x7d, 0xf0, 0xff, 0x51, 0x14, 0x56, 0xe2, 0x1f, 0x7d, 0x11, 0x63, 0x67, 0xb0, 0x67, 0xdc, 0x56, - 0x67, 0xd4, 0xbf, 0xeb, 0x35, 0xac, 0xa0, 0xbe, 0x5a, 0x53, 0xbc, 0xdb, 0xb6, 0x32, 0x23, 0x97, - 0xc2, 0xa3, 0xb8, 0xda, 0xb9, 0x19, 0x0e, 0xfb, 0xa3, 0x51, 0xaf, 0xdb, 0x40, 0xc1, 0xd1, 0x6a, - 0x4d, 0x6b, 0x3b, 0xbb, 0x03, 0xb3, 0x99, 0x34, 0x46, 0xf0, 0xe0, 0xff, 0xf3, 0x0b, 0xb1, 0xde, - 0x5e, 0x49, 0x99, 0xd5, 0xf6, 0x37, 0x5b, 0x62, 0x7d, 0x6c, 0x89, 0xf5, 0x54, 0x10, 0xb4, 0x29, - 0x08, 0x7a, 0x2f, 0x08, 0xfa, 0x2a, 0x08, 0x4a, 0xdd, 0xb2, 0xf5, 0xf5, 0x77, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x9c, 0xce, 0xfc, 0xc2, 0x5f, 0x01, 0x00, 0x00, + // 309 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4d, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, + 0x4a, 0x41, 0x66, 0x16, 0xe7, 0x25, 0x16, 0x14, 0x67, 0xe4, 0x97, 0xe8, 0x17, 0x97, 0xe4, 0x17, + 0x25, 0xa6, 0xa7, 0xea, 0x27, 0xe5, 0xe7, 0x94, 0xa4, 0x24, 0xe9, 0x17, 0xa5, 0x26, 0xe7, 0x17, + 0xa5, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xf1, 0x22, 0x34, 0xe8, 0x95, 0x19, 0x4a, 0x89, + 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x65, 0xf4, 0x41, 0x2c, 0x88, 0x22, 0xa5, 0x7a, 0x2e, 0x8e, 0x60, + 0xa8, 0x61, 0x42, 0x62, 0x5c, 0x4c, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x2c, 0x4e, 0x6c, + 0x8f, 0xee, 0xc9, 0x33, 0x79, 0xba, 0x04, 0x31, 0x65, 0xa6, 0x08, 0x89, 0x71, 0xb1, 0x15, 0x24, + 0x16, 0xa5, 0xe6, 0x95, 0x48, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x79, 0x42, 0xea, 0x5c, + 0x2c, 0xd9, 0x99, 0x79, 0x29, 0x12, 0x2c, 0x0a, 0x8c, 0x1a, 0x7c, 0x46, 0xc2, 0x7a, 0x28, 0xf6, + 0xe9, 0x79, 0x67, 0xe6, 0xa5, 0x04, 0x81, 0x15, 0x08, 0x49, 0x71, 0x71, 0x14, 0xa5, 0x26, 0xa6, + 0xe4, 0xe7, 0xe5, 0x54, 0x4a, 0xb0, 0x2a, 0x30, 0x6a, 0x70, 0x04, 0xc1, 0xf9, 0x5a, 0x41, 0x5c, + 0x2c, 0xde, 0x10, 0x35, 0x6c, 0x8e, 0xce, 0x21, 0x9e, 0x61, 0xae, 0x02, 0x0c, 0x52, 0x7c, 0x5d, + 0x73, 0x15, 0xb8, 0x40, 0xa2, 0x8e, 0xc9, 0x25, 0x99, 0x65, 0xa9, 0x42, 0x0a, 0x5c, 0x9c, 0xce, + 0xfe, 0xbe, 0xbe, 0x9e, 0x21, 0x21, 0xae, 0x2e, 0x02, 0x8c, 0x52, 0x82, 0x5d, 0x73, 0x15, 0x78, + 0x41, 0xd2, 0xce, 0xf9, 0xb9, 0xb9, 0x99, 0x25, 0x25, 0xa9, 0x29, 0x52, 0x3c, 0x1d, 0x8b, 0xe5, + 0x18, 0x76, 0x2d, 0x91, 0x03, 0x9b, 0xe5, 0x24, 0x71, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, + 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, + 0x39, 0xc6, 0x24, 0x36, 0xb0, 0xaf, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x73, 0x89, 0x2b, + 0x02, 0x63, 0x01, 0x00, 0x00, } diff --git a/snapshot/storage/metastore.go b/snapshot/storage/metastore.go index f863e7c..31709df 100644 --- a/snapshot/storage/metastore.go +++ b/snapshot/storage/metastore.go @@ -3,7 +3,7 @@ package storage import ( "context" - "github.com/docker/containerd/snapshot" + "github.com/containerd/containerd/snapshot" ) // MetaStore is used to store metadata related to a snapshot driver. The diff --git a/snapshot/storage/testsuite/bench.go b/snapshot/storage/testsuite/bench.go index cb104bd..8b36ef6 100644 --- a/snapshot/storage/testsuite/bench.go +++ b/snapshot/storage/testsuite/bench.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/docker/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot/storage" ) // Benchmarks returns a benchmark suite using the provided metadata store diff --git a/snapshot/storage/testsuite/testsuite.go b/snapshot/storage/testsuite/testsuite.go index ce300f6..fd38d28 100644 --- a/snapshot/storage/testsuite/testsuite.go +++ b/snapshot/storage/testsuite/testsuite.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/snapshot/storage" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/snapshot/storage" "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/snapshot/testsuite/testsuite.go b/snapshot/testsuite/testsuite.go index 240de78..d163350 100644 --- a/snapshot/testsuite/testsuite.go +++ b/snapshot/testsuite/testsuite.go @@ -9,10 +9,10 @@ import ( "syscall" "testing" - "github.com/docker/containerd" - "github.com/docker/containerd/fs/fstest" - "github.com/docker/containerd/snapshot" - "github.com/docker/containerd/testutil" + "github.com/containerd/containerd" + "github.com/containerd/containerd/fs/fstest" + "github.com/containerd/containerd/snapshot" + "github.com/containerd/containerd/testutil" "github.com/stretchr/testify/assert" ) diff --git a/version.go b/version.go index 489f220..7a94486 100644 --- a/version.go +++ b/version.go @@ -1,7 +1,7 @@ package containerd var ( - Package = "github.com/docker/containerd" + Package = "github.com/containerd/containerd" // Version holds the complete version number. Version = "1.0-dev+unknown"