diff --git a/hack/vendor.sh b/hack/vendor.sh index 8084f2eb9d..b51fc68985 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -61,3 +61,4 @@ mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar clone git github.com/godbus/dbus v1 clone git github.com/coreos/go-systemd v2 +clone git github.com/docker/libcontainer bfcd86f32d22096ae69a140a1fafc1bc42391b1c diff --git a/pkg/libcontainer/TODO.md b/pkg/libcontainer/TODO.md deleted file mode 100644 index 87224db85d..0000000000 --- a/pkg/libcontainer/TODO.md +++ /dev/null @@ -1,11 +0,0 @@ -#### goals -* small and simple - line count is not everything but less code is better -* provide primitives for working with namespaces not cater to every option -* extend via configuration not by features - host networking, no networking, veth network can be accomplished via adjusting the container.json, nothing to do with code - -#### tasks -* reexec or raw syscalls for new process in existing container -* example configs for different setups (host networking, boot init) -* improve pkg documentation with comments -* testing - this is hard in a low level pkg but we could do some, maybe -* selinux diff --git a/vendor/src/github.com/docker/libcontainer/LICENSE b/vendor/src/github.com/docker/libcontainer/LICENSE new file mode 100644 index 0000000000..27448585ad --- /dev/null +++ b/vendor/src/github.com/docker/libcontainer/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2014 Docker, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pkg/libcontainer/MAINTAINERS b/vendor/src/github.com/docker/libcontainer/MAINTAINERS similarity index 73% rename from pkg/libcontainer/MAINTAINERS rename to vendor/src/github.com/docker/libcontainer/MAINTAINERS index 41f04602ee..30cb8bba27 100644 --- a/pkg/libcontainer/MAINTAINERS +++ b/vendor/src/github.com/docker/libcontainer/MAINTAINERS @@ -1,4 +1,3 @@ Michael Crosby (@crosbymichael) -Guillaume J. Charmes (@creack) Rohit Jnagal (@rjnagal) Victor Marmol (@vmarmol) diff --git a/vendor/src/github.com/docker/libcontainer/NOTICE b/vendor/src/github.com/docker/libcontainer/NOTICE new file mode 100644 index 0000000000..ca1635f896 --- /dev/null +++ b/vendor/src/github.com/docker/libcontainer/NOTICE @@ -0,0 +1,16 @@ +libcontainer +Copyright 2012-2014 Docker, Inc. + +This product includes software developed at Docker, Inc. (http://www.docker.com). + +The following is courtesy of our legal counsel: + + +Use and transfer of Docker may be subject to certain restrictions by the +United States and other governments. +It is your responsibility to ensure that your use and/or transfer does not +violate applicable laws. + +For more information, please see http://www.bis.doc.gov + +See also http://www.apache.org/dev/crypto.html and/or seek legal counsel. diff --git a/pkg/libcontainer/README.md b/vendor/src/github.com/docker/libcontainer/README.md similarity index 93% rename from pkg/libcontainer/README.md rename to vendor/src/github.com/docker/libcontainer/README.md index 8e89153bd7..f7f6760ccb 100644 --- a/pkg/libcontainer/README.md +++ b/vendor/src/github.com/docker/libcontainer/README.md @@ -35,3 +35,8 @@ If you wish to spawn another process inside the container while your current bas running just run the exact same command again to get another bash shell or change the command. If the original process dies, PID 1, all other processes spawned inside the container will also be killed and the namespace will be removed. You can identify if a process is running in a container by looking to see if `pid` is in the root of the directory. + +## Copyright and license + +Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license. +Docs released under Creative commons. diff --git a/pkg/libcontainer/apparmor/apparmor.go b/vendor/src/github.com/docker/libcontainer/apparmor/apparmor.go similarity index 100% rename from pkg/libcontainer/apparmor/apparmor.go rename to vendor/src/github.com/docker/libcontainer/apparmor/apparmor.go diff --git a/pkg/libcontainer/apparmor/apparmor_disabled.go b/vendor/src/github.com/docker/libcontainer/apparmor/apparmor_disabled.go similarity index 100% rename from pkg/libcontainer/apparmor/apparmor_disabled.go rename to vendor/src/github.com/docker/libcontainer/apparmor/apparmor_disabled.go diff --git a/pkg/libcontainer/apparmor/gen.go b/vendor/src/github.com/docker/libcontainer/apparmor/gen.go similarity index 100% rename from pkg/libcontainer/apparmor/gen.go rename to vendor/src/github.com/docker/libcontainer/apparmor/gen.go diff --git a/pkg/libcontainer/apparmor/setup.go b/vendor/src/github.com/docker/libcontainer/apparmor/setup.go similarity index 100% rename from pkg/libcontainer/apparmor/setup.go rename to vendor/src/github.com/docker/libcontainer/apparmor/setup.go diff --git a/pkg/libcontainer/cgroups/cgroups.go b/vendor/src/github.com/docker/libcontainer/cgroups/cgroups.go similarity index 97% rename from pkg/libcontainer/cgroups/cgroups.go rename to vendor/src/github.com/docker/libcontainer/cgroups/cgroups.go index 85607b548a..64ece568c3 100644 --- a/pkg/libcontainer/cgroups/cgroups.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/cgroups.go @@ -3,7 +3,7 @@ package cgroups import ( "errors" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/devices" ) var ( diff --git a/pkg/libcontainer/cgroups/cgroups_test.go b/vendor/src/github.com/docker/libcontainer/cgroups/cgroups_test.go similarity index 100% rename from pkg/libcontainer/cgroups/cgroups_test.go rename to vendor/src/github.com/docker/libcontainer/cgroups/cgroups_test.go diff --git a/pkg/libcontainer/cgroups/fs/apply_raw.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/apply_raw.go similarity index 98% rename from pkg/libcontainer/cgroups/fs/apply_raw.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/apply_raw.go index 2231ab9a38..1a0323f442 100644 --- a/pkg/libcontainer/cgroups/fs/apply_raw.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/apply_raw.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) var ( diff --git a/pkg/libcontainer/cgroups/fs/blkio.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio.go similarity index 98% rename from pkg/libcontainer/cgroups/fs/blkio.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio.go index 0c7a4e7b39..0e0a198de6 100644 --- a/pkg/libcontainer/cgroups/fs/blkio.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type blkioGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/blkio_test.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio_test.go similarity index 99% rename from pkg/libcontainer/cgroups/fs/blkio_test.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio_test.go index d91a6479a9..c916c86bba 100644 --- a/pkg/libcontainer/cgroups/fs/blkio_test.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/blkio_test.go @@ -3,7 +3,7 @@ package fs import ( "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) const ( diff --git a/pkg/libcontainer/cgroups/fs/cpu.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu.go similarity index 96% rename from pkg/libcontainer/cgroups/fs/cpu.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu.go index 2e9d588f4f..1c692fd550 100644 --- a/pkg/libcontainer/cgroups/fs/cpu.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu.go @@ -7,7 +7,7 @@ import ( "strconv" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type cpuGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/cpu_test.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu_test.go similarity index 96% rename from pkg/libcontainer/cgroups/fs/cpu_test.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu_test.go index c5bfc50409..ebdb6a5757 100644 --- a/pkg/libcontainer/cgroups/fs/cpu_test.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpu_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func TestCpuStats(t *testing.T) { diff --git a/pkg/libcontainer/cgroups/fs/cpuacct.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuacct.go similarity index 98% rename from pkg/libcontainer/cgroups/fs/cpuacct.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuacct.go index 5ea01dc94a..fe831d1be5 100644 --- a/pkg/libcontainer/cgroups/fs/cpuacct.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuacct.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/cgroups/fs/cpuset.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuset.go similarity index 97% rename from pkg/libcontainer/cgroups/fs/cpuset.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuset.go index c0b03c559e..094e8b382d 100644 --- a/pkg/libcontainer/cgroups/fs/cpuset.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/cpuset.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type cpusetGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/devices.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/devices.go similarity index 90% rename from pkg/libcontainer/cgroups/fs/devices.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/devices.go index 45c3b48530..675cef3fb2 100644 --- a/pkg/libcontainer/cgroups/fs/devices.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/devices.go @@ -1,6 +1,6 @@ package fs -import "github.com/dotcloud/docker/pkg/libcontainer/cgroups" +import "github.com/docker/libcontainer/cgroups" type devicesGroup struct { } diff --git a/pkg/libcontainer/cgroups/fs/freezer.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/freezer.go similarity index 96% rename from pkg/libcontainer/cgroups/fs/freezer.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/freezer.go index 5c9ba5b543..f6a1044af6 100644 --- a/pkg/libcontainer/cgroups/fs/freezer.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/freezer.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type freezerGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/memory.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/memory.go similarity index 97% rename from pkg/libcontainer/cgroups/fs/memory.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/memory.go index 202ddc8ede..b4453f4e71 100644 --- a/pkg/libcontainer/cgroups/fs/memory.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/memory.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type memoryGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/memory_test.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/memory_test.go similarity index 98% rename from pkg/libcontainer/cgroups/fs/memory_test.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/memory_test.go index 29aea1f219..8307482bce 100644 --- a/pkg/libcontainer/cgroups/fs/memory_test.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/memory_test.go @@ -3,7 +3,7 @@ package fs import ( "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) const ( diff --git a/pkg/libcontainer/cgroups/fs/perf_event.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/perf_event.go similarity index 89% rename from pkg/libcontainer/cgroups/fs/perf_event.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/perf_event.go index 1eb4df11b5..b834c3ecae 100644 --- a/pkg/libcontainer/cgroups/fs/perf_event.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/perf_event.go @@ -1,7 +1,7 @@ package fs import ( - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type perfEventGroup struct { diff --git a/pkg/libcontainer/cgroups/fs/stats_test_util.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/stats_test_util.go similarity index 97% rename from pkg/libcontainer/cgroups/fs/stats_test_util.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/stats_test_util.go index bebd0cb3e3..7e7da754d0 100644 --- a/pkg/libcontainer/cgroups/fs/stats_test_util.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/fs/stats_test_util.go @@ -5,7 +5,7 @@ import ( "log" "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error { diff --git a/pkg/libcontainer/cgroups/fs/test_util.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/test_util.go similarity index 100% rename from pkg/libcontainer/cgroups/fs/test_util.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/test_util.go diff --git a/pkg/libcontainer/cgroups/fs/utils.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/utils.go similarity index 100% rename from pkg/libcontainer/cgroups/fs/utils.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/utils.go diff --git a/pkg/libcontainer/cgroups/fs/utils_test.go b/vendor/src/github.com/docker/libcontainer/cgroups/fs/utils_test.go similarity index 100% rename from pkg/libcontainer/cgroups/fs/utils_test.go rename to vendor/src/github.com/docker/libcontainer/cgroups/fs/utils_test.go diff --git a/pkg/libcontainer/cgroups/stats.go b/vendor/src/github.com/docker/libcontainer/cgroups/stats.go similarity index 100% rename from pkg/libcontainer/cgroups/stats.go rename to vendor/src/github.com/docker/libcontainer/cgroups/stats.go diff --git a/pkg/libcontainer/cgroups/systemd/apply_nosystemd.go b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_nosystemd.go similarity index 88% rename from pkg/libcontainer/cgroups/systemd/apply_nosystemd.go rename to vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_nosystemd.go index c72bb11611..6dcfdffd48 100644 --- a/pkg/libcontainer/cgroups/systemd/apply_nosystemd.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_nosystemd.go @@ -5,7 +5,7 @@ package systemd import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func UseSystemd() bool { diff --git a/pkg/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go similarity index 99% rename from pkg/libcontainer/cgroups/systemd/apply_systemd.go rename to vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go index c486dbeb9c..6a0ce950c1 100644 --- a/pkg/libcontainer/cgroups/systemd/apply_systemd.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go @@ -14,7 +14,7 @@ import ( "time" systemd1 "github.com/coreos/go-systemd/dbus" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/systemd" "github.com/godbus/dbus" ) diff --git a/pkg/libcontainer/cgroups/utils.go b/vendor/src/github.com/docker/libcontainer/cgroups/utils.go similarity index 100% rename from pkg/libcontainer/cgroups/utils.go rename to vendor/src/github.com/docker/libcontainer/cgroups/utils.go diff --git a/pkg/libcontainer/console/console.go b/vendor/src/github.com/docker/libcontainer/console/console.go similarity index 96% rename from pkg/libcontainer/console/console.go rename to vendor/src/github.com/docker/libcontainer/console/console.go index ccab528105..519b5644cd 100644 --- a/pkg/libcontainer/console/console.go +++ b/vendor/src/github.com/docker/libcontainer/console/console.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/label" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/container.go b/vendor/src/github.com/docker/libcontainer/container.go similarity index 97% rename from pkg/libcontainer/container.go rename to vendor/src/github.com/docker/libcontainer/container.go index c5864e948a..be72d92eee 100644 --- a/pkg/libcontainer/container.go +++ b/vendor/src/github.com/docker/libcontainer/container.go @@ -1,8 +1,8 @@ package libcontainer import ( - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/devices" ) // Context is a generic key value pair that allows arbatrary data to be sent diff --git a/pkg/libcontainer/container.json b/vendor/src/github.com/docker/libcontainer/container.json similarity index 100% rename from pkg/libcontainer/container.json rename to vendor/src/github.com/docker/libcontainer/container.json diff --git a/pkg/libcontainer/container_test.go b/vendor/src/github.com/docker/libcontainer/container_test.go similarity index 100% rename from pkg/libcontainer/container_test.go rename to vendor/src/github.com/docker/libcontainer/container_test.go diff --git a/pkg/libcontainer/devices/defaults.go b/vendor/src/github.com/docker/libcontainer/devices/defaults.go similarity index 100% rename from pkg/libcontainer/devices/defaults.go rename to vendor/src/github.com/docker/libcontainer/devices/defaults.go diff --git a/pkg/libcontainer/devices/devices.go b/vendor/src/github.com/docker/libcontainer/devices/devices.go similarity index 100% rename from pkg/libcontainer/devices/devices.go rename to vendor/src/github.com/docker/libcontainer/devices/devices.go diff --git a/pkg/libcontainer/devices/number.go b/vendor/src/github.com/docker/libcontainer/devices/number.go similarity index 100% rename from pkg/libcontainer/devices/number.go rename to vendor/src/github.com/docker/libcontainer/devices/number.go diff --git a/pkg/libcontainer/label/label.go b/vendor/src/github.com/docker/libcontainer/label/label.go similarity index 100% rename from pkg/libcontainer/label/label.go rename to vendor/src/github.com/docker/libcontainer/label/label.go diff --git a/pkg/libcontainer/label/label_selinux.go b/vendor/src/github.com/docker/libcontainer/label/label_selinux.go similarity index 96% rename from pkg/libcontainer/label/label_selinux.go rename to vendor/src/github.com/docker/libcontainer/label/label_selinux.go index 1ef8891e5c..0452144482 100644 --- a/pkg/libcontainer/label/label_selinux.go +++ b/vendor/src/github.com/docker/libcontainer/label/label_selinux.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/dotcloud/docker/pkg/libcontainer/selinux" + "github.com/docker/libcontainer/selinux" ) func GenLabels(options string) (string, string, error) { diff --git a/pkg/libcontainer/mount/init.go b/vendor/src/github.com/docker/libcontainer/mount/init.go similarity index 97% rename from pkg/libcontainer/mount/init.go rename to vendor/src/github.com/docker/libcontainer/mount/init.go index 0338fe7caf..4e913ad1e4 100644 --- a/pkg/libcontainer/mount/init.go +++ b/vendor/src/github.com/docker/libcontainer/mount/init.go @@ -8,9 +8,9 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/label" - "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/symlink" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/mount/msmoveroot.go b/vendor/src/github.com/docker/libcontainer/mount/msmoveroot.go similarity index 100% rename from pkg/libcontainer/mount/msmoveroot.go rename to vendor/src/github.com/docker/libcontainer/mount/msmoveroot.go diff --git a/pkg/libcontainer/mount/nodes/nodes.go b/vendor/src/github.com/docker/libcontainer/mount/nodes/nodes.go similarity index 95% rename from pkg/libcontainer/mount/nodes/nodes.go rename to vendor/src/github.com/docker/libcontainer/mount/nodes/nodes.go index dd67ae2d58..e3420b48bd 100644 --- a/pkg/libcontainer/mount/nodes/nodes.go +++ b/vendor/src/github.com/docker/libcontainer/mount/nodes/nodes.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/devices" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/mount/nodes/nodes_unsupported.go b/vendor/src/github.com/docker/libcontainer/mount/nodes/nodes_unsupported.go similarity index 61% rename from pkg/libcontainer/mount/nodes/nodes_unsupported.go rename to vendor/src/github.com/docker/libcontainer/mount/nodes/nodes_unsupported.go index 0e5d12c73e..3811a1d739 100644 --- a/pkg/libcontainer/mount/nodes/nodes_unsupported.go +++ b/vendor/src/github.com/docker/libcontainer/mount/nodes/nodes_unsupported.go @@ -3,8 +3,8 @@ package nodes import ( - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/devices" ) func CreateDeviceNodes(rootfs string, nodesToCreate []*devices.Device) error { diff --git a/pkg/libcontainer/mount/pivotroot.go b/vendor/src/github.com/docker/libcontainer/mount/pivotroot.go similarity index 100% rename from pkg/libcontainer/mount/pivotroot.go rename to vendor/src/github.com/docker/libcontainer/mount/pivotroot.go diff --git a/pkg/libcontainer/mount/ptmx.go b/vendor/src/github.com/docker/libcontainer/mount/ptmx.go similarity index 90% rename from pkg/libcontainer/mount/ptmx.go rename to vendor/src/github.com/docker/libcontainer/mount/ptmx.go index f6ca534637..32c025202e 100644 --- a/pkg/libcontainer/mount/ptmx.go +++ b/vendor/src/github.com/docker/libcontainer/mount/ptmx.go @@ -4,7 +4,7 @@ package mount import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer/console" + "github.com/docker/libcontainer/console" "os" "path/filepath" ) diff --git a/pkg/libcontainer/mount/readonly.go b/vendor/src/github.com/docker/libcontainer/mount/readonly.go similarity index 100% rename from pkg/libcontainer/mount/readonly.go rename to vendor/src/github.com/docker/libcontainer/mount/readonly.go diff --git a/pkg/libcontainer/mount/remount.go b/vendor/src/github.com/docker/libcontainer/mount/remount.go similarity index 100% rename from pkg/libcontainer/mount/remount.go rename to vendor/src/github.com/docker/libcontainer/mount/remount.go diff --git a/pkg/libcontainer/namespaces/create.go b/vendor/src/github.com/docker/libcontainer/namespaces/create.go similarity index 80% rename from pkg/libcontainer/namespaces/create.go rename to vendor/src/github.com/docker/libcontainer/namespaces/create.go index 60b2a2db02..20bef20459 100644 --- a/pkg/libcontainer/namespaces/create.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/create.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) type CreateCommand func(container *libcontainer.Container, console, rootfs, dataPath, init string, childPipe *os.File, args []string) *exec.Cmd diff --git a/pkg/libcontainer/namespaces/exec.go b/vendor/src/github.com/docker/libcontainer/namespaces/exec.go similarity index 94% rename from pkg/libcontainer/namespaces/exec.go rename to vendor/src/github.com/docker/libcontainer/namespaces/exec.go index 288205ea60..31d5ba21d8 100644 --- a/pkg/libcontainer/namespaces/exec.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/exec.go @@ -7,11 +7,11 @@ import ( "os/exec" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd" - "github.com/dotcloud/docker/pkg/libcontainer/network" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" + "github.com/docker/libcontainer/cgroups/systemd" + "github.com/docker/libcontainer/network" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/namespaces/execin.go b/vendor/src/github.com/docker/libcontainer/namespaces/execin.go similarity index 93% rename from pkg/libcontainer/namespaces/execin.go rename to vendor/src/github.com/docker/libcontainer/namespaces/execin.go index e4f07ae1e7..97bbb5f79d 100644 --- a/pkg/libcontainer/namespaces/execin.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/execin.go @@ -7,8 +7,8 @@ import ( "os" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/label" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/namespaces/init.go b/vendor/src/github.com/docker/libcontainer/namespaces/init.go similarity index 91% rename from pkg/libcontainer/namespaces/init.go rename to vendor/src/github.com/docker/libcontainer/namespaces/init.go index 27cd9bfdc8..9bad7cc9b4 100644 --- a/pkg/libcontainer/namespaces/init.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/init.go @@ -9,16 +9,16 @@ import ( "strings" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" - "github.com/dotcloud/docker/pkg/libcontainer/console" - "github.com/dotcloud/docker/pkg/libcontainer/label" - "github.com/dotcloud/docker/pkg/libcontainer/mount" - "github.com/dotcloud/docker/pkg/libcontainer/netlink" - "github.com/dotcloud/docker/pkg/libcontainer/network" - "github.com/dotcloud/docker/pkg/libcontainer/security/capabilities" - "github.com/dotcloud/docker/pkg/libcontainer/security/restrict" - "github.com/dotcloud/docker/pkg/libcontainer/utils" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/apparmor" + "github.com/docker/libcontainer/console" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount" + "github.com/docker/libcontainer/netlink" + "github.com/docker/libcontainer/network" + "github.com/docker/libcontainer/security/capabilities" + "github.com/docker/libcontainer/security/restrict" + "github.com/docker/libcontainer/utils" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/user" ) diff --git a/pkg/libcontainer/namespaces/nsenter.go b/vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go similarity index 100% rename from pkg/libcontainer/namespaces/nsenter.go rename to vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go diff --git a/pkg/libcontainer/namespaces/pid.go b/vendor/src/github.com/docker/libcontainer/namespaces/pid.go similarity index 100% rename from pkg/libcontainer/namespaces/pid.go rename to vendor/src/github.com/docker/libcontainer/namespaces/pid.go diff --git a/pkg/libcontainer/namespaces/std_term.go b/vendor/src/github.com/docker/libcontainer/namespaces/std_term.go similarity index 100% rename from pkg/libcontainer/namespaces/std_term.go rename to vendor/src/github.com/docker/libcontainer/namespaces/std_term.go diff --git a/pkg/libcontainer/namespaces/sync_pipe.go b/vendor/src/github.com/docker/libcontainer/namespaces/sync_pipe.go similarity index 97% rename from pkg/libcontainer/namespaces/sync_pipe.go rename to vendor/src/github.com/docker/libcontainer/namespaces/sync_pipe.go index e12ed447fa..6fa8465790 100644 --- a/pkg/libcontainer/namespaces/sync_pipe.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/sync_pipe.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) // SyncPipe allows communication to and from the child processes diff --git a/pkg/libcontainer/namespaces/term.go b/vendor/src/github.com/docker/libcontainer/namespaces/term.go similarity index 100% rename from pkg/libcontainer/namespaces/term.go rename to vendor/src/github.com/docker/libcontainer/namespaces/term.go diff --git a/pkg/libcontainer/namespaces/tty_term.go b/vendor/src/github.com/docker/libcontainer/namespaces/tty_term.go similarity index 100% rename from pkg/libcontainer/namespaces/tty_term.go rename to vendor/src/github.com/docker/libcontainer/namespaces/tty_term.go diff --git a/pkg/libcontainer/namespaces/unsupported.go b/vendor/src/github.com/docker/libcontainer/namespaces/unsupported.go similarity index 88% rename from pkg/libcontainer/namespaces/unsupported.go rename to vendor/src/github.com/docker/libcontainer/namespaces/unsupported.go index b459b4d2f5..a0653ee8ad 100644 --- a/pkg/libcontainer/namespaces/unsupported.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/unsupported.go @@ -3,8 +3,8 @@ package namespaces import ( - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups" ) func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) { diff --git a/pkg/libcontainer/netlink/MAINTAINERS b/vendor/src/github.com/docker/libcontainer/netlink/MAINTAINERS similarity index 100% rename from pkg/libcontainer/netlink/MAINTAINERS rename to vendor/src/github.com/docker/libcontainer/netlink/MAINTAINERS diff --git a/pkg/libcontainer/netlink/netlink.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink.go similarity index 100% rename from pkg/libcontainer/netlink/netlink.go rename to vendor/src/github.com/docker/libcontainer/netlink/netlink.go diff --git a/pkg/libcontainer/netlink/netlink_linux.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go similarity index 100% rename from pkg/libcontainer/netlink/netlink_linux.go rename to vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go diff --git a/pkg/libcontainer/netlink/netlink_unsupported.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go similarity index 100% rename from pkg/libcontainer/netlink/netlink_unsupported.go rename to vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go diff --git a/pkg/libcontainer/network/loopback.go b/vendor/src/github.com/docker/libcontainer/network/loopback.go similarity index 92% rename from pkg/libcontainer/network/loopback.go rename to vendor/src/github.com/docker/libcontainer/network/loopback.go index 6215061dc2..218d1959be 100644 --- a/pkg/libcontainer/network/loopback.go +++ b/vendor/src/github.com/docker/libcontainer/network/loopback.go @@ -2,7 +2,7 @@ package network import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) // Loopback is a network strategy that provides a basic loopback device diff --git a/pkg/libcontainer/network/netns.go b/vendor/src/github.com/docker/libcontainer/network/netns.go similarity index 95% rename from pkg/libcontainer/network/netns.go rename to vendor/src/github.com/docker/libcontainer/network/netns.go index 7e311f22d8..e8a9188ddb 100644 --- a/pkg/libcontainer/network/netns.go +++ b/vendor/src/github.com/docker/libcontainer/network/netns.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/network/network.go b/vendor/src/github.com/docker/libcontainer/network/network.go similarity index 96% rename from pkg/libcontainer/network/network.go rename to vendor/src/github.com/docker/libcontainer/network/network.go index 75d0040135..94cd711d2f 100644 --- a/pkg/libcontainer/network/network.go +++ b/vendor/src/github.com/docker/libcontainer/network/network.go @@ -1,7 +1,7 @@ package network import ( - "github.com/dotcloud/docker/pkg/libcontainer/netlink" + "github.com/docker/libcontainer/netlink" "net" ) diff --git a/pkg/libcontainer/network/strategy.go b/vendor/src/github.com/docker/libcontainer/network/strategy.go similarity index 94% rename from pkg/libcontainer/network/strategy.go rename to vendor/src/github.com/docker/libcontainer/network/strategy.go index e41ecc3ea6..321cf58e3d 100644 --- a/pkg/libcontainer/network/strategy.go +++ b/vendor/src/github.com/docker/libcontainer/network/strategy.go @@ -3,7 +3,7 @@ package network import ( "errors" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) var ( diff --git a/pkg/libcontainer/network/veth.go b/vendor/src/github.com/docker/libcontainer/network/veth.go similarity index 96% rename from pkg/libcontainer/network/veth.go rename to vendor/src/github.com/docker/libcontainer/network/veth.go index d3be221c60..4dad4aa20a 100644 --- a/pkg/libcontainer/network/veth.go +++ b/vendor/src/github.com/docker/libcontainer/network/veth.go @@ -2,8 +2,8 @@ package network import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/utils" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/utils" ) // Veth is a network strategy that uses a bridge and creates diff --git a/pkg/libcontainer/nsinit/exec.go b/vendor/src/github.com/docker/libcontainer/nsinit/exec.go similarity index 94% rename from pkg/libcontainer/nsinit/exec.go rename to vendor/src/github.com/docker/libcontainer/nsinit/exec.go index d4ce1ca8c4..5bbfd088d4 100644 --- a/pkg/libcontainer/nsinit/exec.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/exec.go @@ -8,8 +8,8 @@ import ( "os/signal" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/namespaces" ) var execCommand = cli.Command{ diff --git a/pkg/libcontainer/nsinit/init.go b/vendor/src/github.com/docker/libcontainer/nsinit/init.go similarity index 93% rename from pkg/libcontainer/nsinit/init.go rename to vendor/src/github.com/docker/libcontainer/nsinit/init.go index 20096f0218..eedb961054 100644 --- a/pkg/libcontainer/nsinit/init.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/init.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer/namespaces" ) var ( diff --git a/pkg/libcontainer/nsinit/main.go b/vendor/src/github.com/docker/libcontainer/nsinit/main.go similarity index 100% rename from pkg/libcontainer/nsinit/main.go rename to vendor/src/github.com/docker/libcontainer/nsinit/main.go diff --git a/pkg/libcontainer/nsinit/nsenter.go b/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go similarity index 93% rename from pkg/libcontainer/nsinit/nsenter.go rename to vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go index 54644282d4..8a9caa75f4 100644 --- a/pkg/libcontainer/nsinit/nsenter.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer/namespaces" ) var nsenterCommand = cli.Command{ diff --git a/pkg/libcontainer/nsinit/spec.go b/vendor/src/github.com/docker/libcontainer/nsinit/spec.go similarity index 93% rename from pkg/libcontainer/nsinit/spec.go rename to vendor/src/github.com/docker/libcontainer/nsinit/spec.go index 2eb4da9fc5..24294ff378 100644 --- a/pkg/libcontainer/nsinit/spec.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/spec.go @@ -6,7 +6,7 @@ import ( "log" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) var specCommand = cli.Command{ diff --git a/pkg/libcontainer/nsinit/stats.go b/vendor/src/github.com/docker/libcontainer/nsinit/stats.go similarity index 88% rename from pkg/libcontainer/nsinit/stats.go rename to vendor/src/github.com/docker/libcontainer/nsinit/stats.go index 023b40a822..ff6a1ce535 100644 --- a/pkg/libcontainer/nsinit/stats.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/stats.go @@ -6,8 +6,8 @@ import ( "log" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups/fs" ) var statsCommand = cli.Command{ diff --git a/pkg/libcontainer/nsinit/utils.go b/vendor/src/github.com/docker/libcontainer/nsinit/utils.go similarity index 95% rename from pkg/libcontainer/nsinit/utils.go rename to vendor/src/github.com/docker/libcontainer/nsinit/utils.go index 9926e2721f..bd49434e44 100644 --- a/pkg/libcontainer/nsinit/utils.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/utils.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) func loadContainer() (*libcontainer.Container, error) { diff --git a/pkg/libcontainer/security/capabilities/capabilities.go b/vendor/src/github.com/docker/libcontainer/security/capabilities/capabilities.go similarity index 96% rename from pkg/libcontainer/security/capabilities/capabilities.go rename to vendor/src/github.com/docker/libcontainer/security/capabilities/capabilities.go index 64ea961a18..ef872178f6 100644 --- a/pkg/libcontainer/security/capabilities/capabilities.go +++ b/vendor/src/github.com/docker/libcontainer/security/capabilities/capabilities.go @@ -3,7 +3,7 @@ package capabilities import ( "os" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" "github.com/syndtr/gocapability/capability" ) diff --git a/pkg/libcontainer/security/restrict/restrict.go b/vendor/src/github.com/docker/libcontainer/security/restrict/restrict.go similarity index 100% rename from pkg/libcontainer/security/restrict/restrict.go rename to vendor/src/github.com/docker/libcontainer/security/restrict/restrict.go diff --git a/pkg/libcontainer/security/restrict/unsupported.go b/vendor/src/github.com/docker/libcontainer/security/restrict/unsupported.go similarity index 100% rename from pkg/libcontainer/security/restrict/unsupported.go rename to vendor/src/github.com/docker/libcontainer/security/restrict/unsupported.go diff --git a/pkg/libcontainer/selinux/selinux.go b/vendor/src/github.com/docker/libcontainer/selinux/selinux.go similarity index 100% rename from pkg/libcontainer/selinux/selinux.go rename to vendor/src/github.com/docker/libcontainer/selinux/selinux.go diff --git a/pkg/libcontainer/selinux/selinux_test.go b/vendor/src/github.com/docker/libcontainer/selinux/selinux_test.go similarity index 96% rename from pkg/libcontainer/selinux/selinux_test.go rename to vendor/src/github.com/docker/libcontainer/selinux/selinux_test.go index 0e900c1dfe..40ed70d166 100644 --- a/pkg/libcontainer/selinux/selinux_test.go +++ b/vendor/src/github.com/docker/libcontainer/selinux/selinux_test.go @@ -1,7 +1,7 @@ package selinux_test import ( - "github.com/dotcloud/docker/pkg/libcontainer/selinux" + "github.com/docker/libcontainer/selinux" "os" "testing" ) diff --git a/pkg/libcontainer/types.go b/vendor/src/github.com/docker/libcontainer/types.go similarity index 100% rename from pkg/libcontainer/types.go rename to vendor/src/github.com/docker/libcontainer/types.go diff --git a/pkg/libcontainer/types_linux.go b/vendor/src/github.com/docker/libcontainer/types_linux.go similarity index 100% rename from pkg/libcontainer/types_linux.go rename to vendor/src/github.com/docker/libcontainer/types_linux.go diff --git a/pkg/libcontainer/types_test.go b/vendor/src/github.com/docker/libcontainer/types_test.go similarity index 100% rename from pkg/libcontainer/types_test.go rename to vendor/src/github.com/docker/libcontainer/types_test.go diff --git a/pkg/libcontainer/utils/utils.go b/vendor/src/github.com/docker/libcontainer/utils/utils.go similarity index 100% rename from pkg/libcontainer/utils/utils.go rename to vendor/src/github.com/docker/libcontainer/utils/utils.go