toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,409 Commits 3 Branches 295 Tags
74f0d78beb2dc68ea7ca19df996bf95a6f625f81
Commit Graph
7409 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 8832e97391 Merge pull request #4837 from crosbymichael/remove-ci 
Remove docker-ci code from the repo
Upstream-commit: e1035535ec878c8c837bd1fdd433169dd9b5da42
Component: engine
 2014-03-24 18:01:26 -06:00
Michael Crosby 186280f667 Merge pull request #4778 from vbatts/vbatts-save_to_output 
`docker save --output` flags
Upstream-commit: a258d048a221d2598f7317ee8e64765cb20fd588
Component: engine
 2014-03-24 16:52:08 -07:00
Guillaume J. Charmes 665275b36f Merge pull request #4835 from crosbymichael/reverst-stop-kill 
Revert back to the default stop functionality of SIGKILL after timeout
Upstream-commit: c3ff1f41bbc03ad8fd6dad6461660ecf6c6ee67d
Component: engine
 2014-03-24 16:33:38 -07:00
Michael Crosby ac424b1fd8 Merge pull request #4832 from LK4D4/fix_events_hanging_#4804 
Workaround for hanging events. Fixes #4804
Upstream-commit: dece260f3aef2c98c95f3f06ff5ffbf1da3b1f39
Component: engine
 2014-03-24 16:26:50 -07:00
LK4D4 ec5934f5dd Workaround for hanging events. Fixes #4804 
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c7540b3e94d7712b6b91ba80de0155f20156f3f3
Component: engine
 2014-03-24 22:31:32 +04:00
Michael Crosby f6d78803bd Promote btrfs 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 68dd722e3c54995e609b2524bad501ab1d4d15d6
Component: engine
 2014-03-24 14:15:04 +00:00
Michael Crosby aa4d9df883 As far as I know this code is not used or maintained 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f41135bc11b9a4da896e5054a73afa112b2e835f
Component: engine
 2014-03-24 12:39:56 +00:00
Michael Crosby aa948163e7 Revert "Disable automatic killing of containers when docker stop fails" 
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
 2014-03-24 12:03:56 +00:00
Michael Crosby a7b2642223 Revert "fix failing test to use kill instead of stop" 
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
 2014-03-24 12:03:41 +00:00
Michael Crosby fa8143af81 Add unit test for lxc conf merge and native opts 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 10fdbc0467d1be6c7c731d3f35590d87ee42f96f
Component: engine
 2014-03-24 07:16:40 +00:00
Michael Crosby 9d6d07c6ea Add cpuset.cpus to cgroups and native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9a7be1b015a1ba79e5480d0ddddfa5954b994507
Component: engine
 2014-03-24 05:33:11 +00:00
Michael Crosby 90b90efe51 Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714 
Remove duplication of Dns in config merging.
Upstream-commit: 5294bf7e67a67b2f0643c61fb126814d82a1979d
Component: engine
 2014-03-21 17:08:06 -07:00
Victor Vieux 08c755a87a Merge pull request #4800 from vieux/rename_network_driver 
rename lxc to bridge
Upstream-commit: 97e5295f437bbb9eae26c99842b269aae1b427c2
Component: engine
 2014-03-21 16:52:40 -07:00
Michael Crosby f79fdc8091 Merge pull request #4761 from ichik1/fix-display-of-since-time-exit 
Fix since time exit display when s.FinishedAt is zero
Upstream-commit: de450b23bea244747953229c2ba43ca4a78c7368
Component: engine
 2014-03-21 16:48:30 -07:00
Tianon Gravi 90b35c5f04 Add mention of mounting cgroupfs properly to PACKAGERS.md 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 708ecd7da2125a47abb9678ed382893c7b30f10f
Component: engine
 2014-03-21 14:17:09 -06:00
Michael Crosby 9fad5483e0 Change placement of readonly filesystem 
We need to change it to read only at the very end so that bound,
copy dev nodes and other ops do not fail.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2c58a1e2886433a4266615b1f492f829e7a6f53f
Component: engine
 2014-03-21 14:17:17 +00:00
Michael Crosby 2c4bdb6828 Add more native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 83618c2b81c561cd77fd70eca90b2b251f61fcc1
Component: engine
 2014-03-21 14:07:16 +00:00
Michael Crosby 74929e5ece Change syntax to use dots 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 146a212f71fe129f9d349c5c3e80ba4197e35850
Component: engine
 2014-03-21 12:38:50 +00:00
Michael Crosby e56e4f3bca Change flag to -o and --opt 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c9d7f858fd1c6e2d1287e28ee12952333b327c75
Component: engine
 2014-03-21 11:53:15 +00:00
Michael Crosby fd04e06648 Factor out the native driver config options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7c726669cbcc0cfde12c6a9f03974bb672839271
Component: engine
 2014-03-21 08:10:07 +00:00
Ken ICHIKAWA 8e8f727f50 Fix since time exit display when s.FinishedAt is zero 
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: 4002eac8b8b4007de03e78dbd57232fac583d05b
Component: engine
 2014-03-21 15:28:02 +09:00
Victor Vieux d8e651280a Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org 
Resync the DCO text with upstream at http://developercertificate.org/
Upstream-commit: 69db8065426f6db4d27a08324b2a729f383f05eb
Component: engine
 2014-03-20 23:07:08 -07:00
Sven Dowideit 3d953ff4c8 Merge pull request #4803 from alambike/patch-1 
Added Eixo::Docker to the list of libraries
Upstream-commit: 14502f0f1cea7ccb7433374484e90efb5551187d
Component: engine
 2014-03-21 12:49:51 +10:00
alambike abc3562e62 Added Eixo::Docker to the list of libraries 
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com> (github: alambike)
Upstream-commit: 79c11b19ecd506bd76db391b896cec0d4263183d
Component: engine
 2014-03-21 03:13:06 +01:00
Sven Dowideit 66a0a60a2a Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs 
Fix double single dash arg issues in docs
Upstream-commit: 8329cd55e138fb4c1d18675e2a1c7d8afde61c84
Component: engine
 2014-03-21 11:18:21 +10:00
Michael Crosby ffa18d8ad0 Allow containers to join the net namespace of other conatiners 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: be5538d8a8820ac1192c7a5660e0d950927b42d0
Component: engine
 2014-03-21 00:48:17 +00:00
Michael Crosby b80ed35d06 Merge branch 'proppy-nsinit' into pluginflag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1bedae9107108156d6d272494f1ff27d8b4be590
Component: engine
 2014-03-21 00:36:23 +00:00
Michael Crosby b5daa68238 Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87b0df997b35254d9f742926dc7cc0fa0c3bc790
Component: engine
 2014-03-21 00:36:09 +00:00
Michael Crosby c42d40863c Add ability to work with individual namespaces 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 70f3b9f4ce67ee54ec226814cdd26db01f69378d
Component: engine
 2014-03-21 00:23:34 +00:00
Michael Crosby 44fe86670a Allow caps to be toggled in native driver with plugin flag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 443a75d5f66e986e9d7740d3f2aaef080aef8ea0
Component: engine
 2014-03-21 00:10:24 +00:00
Djibril Koné 6ed3664799 Harmonize / across all name-related commands/Validate images names 
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)
Upstream-commit: 43c3ee3ba154e2480191ed3743391810f23f29af
Component: engine
 2014-03-21 00:40:58 +01:00
Michael Crosby 3490f03690 Dont use custom marshaling for caps and namespaces 
This also adds an enabled field to the types so that they
can be easily toggled.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c5f9c4bd6933c806490e4f7cb52557cee154dbed
Component: engine
 2014-03-20 23:09:01 +00:00
Michael Crosby 40c5419c0f Add initial plugin flag to pass lxc and native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f7b3e879fc3047ed93ac6b43cd9bf47a25f3d0fc
Component: engine
 2014-03-20 22:58:02 +00:00
Victor Vieux 2352431354 rename lxc to bridge 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
 2014-03-20 21:51:28 +00:00
Tianon Gravi aae2fd84d8 Remove the inotifywait hack from our upstart host-integration example that is no longer necessary 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ab0c9b385c47d818a2105c2114573f5beedbd3ba
Component: engine
 2014-03-20 14:59:40 -06:00
Brian Goff 0164d2be10 Fix double single dash arg issues in docs 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
 2014-03-20 14:14:54 -04:00
Alexander Larsson ca4686cb04 devicemapper: Better/faster shutdown 
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.

We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.

Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
Component: engine
 2014-03-20 17:38:35 +01:00
Guillaume J. Charmes c2f15d709c Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm 
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
 2014-03-20 09:10:32 -07:00
Tianon Gravi dbde2deea4 Merge pull request #4790 from tianon/fix-release 
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
Upstream-commit: 2678af4ea8576816c5635f9c8e0d927f8faf4de1
Component: engine
 2014-03-19 22:49:19 -06:00
Tianon Gravi d4638ba0e0 Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
 2014-03-19 22:25:09 -06:00
Tianon Gravi 5c73b528de Merge pull request #4788 from SvenDowideit/sign-releases-fixup 
Fix bugs in release.sh
Upstream-commit: 372b7282cbbd09383ae0844eed9d09161dc20b42
Component: engine
 2014-03-19 18:19:25 -06:00
Sven Dowideit 0f7c241763 missed a bug 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 62eb23aed50c9c820836c4b3f515cba2660b5c20
Component: engine
 2014-03-20 10:18:08 +10:00
Sven Dowideit 17b4dbb455 I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: a8cc6ebb181abf58b12ed6ee037711f0b2f1eff2
Component: engine
 2014-03-20 09:59:54 +10:00
Djibril Koné 694ecbc3a5 Harmonize / across all name-related commands 
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)

Harmonize / across all name-related commands

Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)

Harmonize / across all name-related commands:Return an error when repeated /

Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)
Upstream-commit: e38e977a0410b754b6f318ff973dc15e6d756023
Component: engine
 2014-03-20 00:45:29 +01:00
Tianon Gravi a1f1abe495 Merge pull request #4708 from SvenDowideit/sign-releases 
Add md5 and sha256 to binaries on get.docker.io
Upstream-commit: 43124b5613d74ed832ed9f9684506e10ae1c7d98
Component: engine
 2014-03-19 17:38:07 -06:00
Sven Dowideit 04a08a7053 whitespace-blind 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 43febdd432eb8e7dc5988c72710b3d78a5913360
Component: engine
 2014-03-20 09:35:58 +10:00
James Turnbull 08db157788 Merge pull request #4784 from SvenDowideit/reference-security-doc 
add a link to the security documentation when we mention the docker group (or -G)
Upstream-commit: f2b01f5fa1fbb54d2dd78e323b936834635a06c0
Component: engine
 2014-03-19 17:20:44 -06:00
Sven Dowideit 1cf0c29be4 Generate md5 and sha265 hashes when building, and upload them in hack/release.sh 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 179e2c92d8d02d029d8aa54d53edb82b3fbcea2b
Component: engine
 2014-03-20 09:19:47 +10:00
Sven Dowideit 5afb3d1803 add a link to the security documentation when we mention the docker group (or -G) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f3765f96cfb37f6ea9f925f0d3174fe18c4152be
Component: engine
 2014-03-20 09:08:52 +10:00
Victor Vieux 43102e0522 Merge branch 'master' into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: aa63ece2ec8bae9d13c258ad8e771e3a000cc941
Component: engine
 2014-03-19 22:05:36 +00:00