toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,461 Commits 3 Branches 295 Tags
7e9d849ecca20fa90555e919a10b6f8293d534b1
Commit Graph
8461 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Corking 7e9d849ecc Update fedora.md 
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
Upstream-commit: b26bebac318803d9dbcd908ccc3be4f2fb9a88b8
Component: engine
 2014-05-26 12:29:27 +01:00
Sven Dowideit cdddc7f9a6 Merge pull request #6039 from zdover23/26May_dockerfile 
Dockerfile.5.md stub
Upstream-commit: 4a2ca56ea0b5bff797c3d1150c18f5797e58c839
Component: engine
 2014-05-26 16:46:12 +10:00
Zac Dover 4c7d9e6500 Dockerfile.5.md stub 
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
Upstream-commit: 41a913b3906348f6ec3f1929e6d33926c84c1bf1
Component: engine
 2014-05-26 15:57:20 +10:00
Tianon Gravi b842661332 Merge pull request #6037 from tianon/fix-debootstrap-typo 
Fix embarrassing debootstrap typo :)
Upstream-commit: bddcbc1b152d0a696f4bf09ffcb3d2990bcaca45
Component: engine
 2014-05-25 22:37:59 -06:00
Tianon Gravi 7cbab5a63c Fix embarrassing debootstrap typo :) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: dd3319636d749bac3d57fbcd1c3cf4d31fded8b7
Component: engine
 2014-05-25 21:59:43 -06:00
James Turnbull feece77cd3 Merge pull request #6001 from jamtur01/introfixes 
Some fixes to the Intro pages
Upstream-commit: 7393eafde79f67459755ef98d1718c25497783e3
Component: engine
 2014-05-25 00:21:40 +10:00
James Turnbull 438f9224cd Some fixes to the Intro pages 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 955bfda99a991e71af3352d18a007d39970cc508
Component: engine
 2014-05-25 00:20:59 +10:00
Sven Dowideit 13006b0ee7 Merge pull request #6006 from therealprologic/master 
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 22777fbc1e5439883d2e1d5e4fa0e004ea9f4289
Component: engine
 2014-05-24 16:08:14 +10:00
Sven Dowideit dd4e9e1b3f Merge pull request #6016 from ronsmits/patch-1 
Update using_supervisord.md
Upstream-commit: d81912e32313a33cb3ad9c1670e7d61effc9517b
Component: engine
 2014-05-24 16:07:32 +10:00
Sven Dowideit 450acb564a Merge pull request #6023 from proppy/patch-4 
docs/reference/builder: fix USER doc
Upstream-commit: b820b9778f4a4d30c17156d86c6ce926f37ee679
Component: engine
 2014-05-24 13:41:34 +10:00
Johan Euphrosine c6fc71df20 docs/reference/builder: fix USER doc 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: e89cb9a5e0105afbb0c1ba1176bda07d110295bc
Component: engine
 2014-05-23 17:20:15 -07:00
Guillaume J. Charmes 7f0603ffdf Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount 
now busybox as nc
Upstream-commit: baed5d74339407fcc04277d264aa31a995719c75
Component: engine
 2014-05-23 14:48:24 -07:00
Michael Crosby 4f4dc73aee Merge pull request #6018 from vishh/stats_strongtype 
Strong type all stats exported by libcontainer
Upstream-commit: 3b4b0a901de138d72ac4da5376055cdc14656307
Component: engine
 2014-05-23 14:35:14 -07:00
Michael Crosby 52c60119fc Merge pull request #6022 from crosbymichael/iptables-wait 
Add check for iptables xlock support
Upstream-commit: f3bd86376ef46b9e72affa1e3a0058c6af4112b7
Component: engine
 2014-05-23 14:25:51 -07:00
Michael Crosby b33af77b2c Add check for iptables xlock support 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 034babf1753741184c1155a7346ecec86fc51e2c
Component: engine
 2014-05-23 14:18:50 -07:00
Victor Vieux 418706706b now busybox as nc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0be44d1a0a2dfd70c35367d7ee8383feeab8d3b9
Component: engine
 2014-05-23 21:03:52 +00:00
Tibor Vass e460eaadbd Merge pull request #6019 from tianon/update-dockerfile-busybox 
Add specific branch of @jpetazzo's busybox to clone from so we can assume nice things about it
Upstream-commit: 7e38d6a358ff2869e25dc8c6954b4b1b0d1b46a0
Component: engine
 2014-05-23 13:46:48 -07:00
Vishnu Kannan 3391df1350 Added stats.go which provides strong types for all stats that will be exported by libcontainer. This commit only introduces the strong type. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 321b457044f287435780274bef0b4a65231892bc
Component: engine
 2014-05-23 20:42:43 +00:00
Tianon Gravi 19aaa7241b Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 886d3c939687672c6589120229c05435273b7d59
Component: engine
 2014-05-23 14:32:43 -06:00
Tianon Gravi 92526dc8b1 Add specific branch of jpetazzo's busybox to clone from so we can assume nice things about it 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: efa79a09a92b41b07d0aee3c728d98eec5120730
Component: engine
 2014-05-23 14:32:43 -06:00
Tibor Vass 5e62a79cdf Merge pull request #6015 from crosbymichael/update-test-flags 
Update integration tests with --net flag
Upstream-commit: cfded04ac2878f0252c6c0e865151c34fb9ee372
Component: engine
 2014-05-23 13:31:47 -07:00
Tibor Vass 9358189374 Merge pull request #5998 from crosbymichael/iptables-wait 
Add wait flag to iptables
Upstream-commit: 174ab747552bcc9fae9928f8bc0361ad9abafb4e
Component: engine
 2014-05-23 13:31:35 -07:00
Michael Crosby 46f785b005 Update ip test to parse new output 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 24872379375dd66518f09b8063698c2d1fb08df9
Component: engine
 2014-05-23 13:22:01 -07:00
Ron Smits 4ce695adff Update using_supervisord.md 
changed the version of ubuntu to 13.04. In latest sshd will not work.
Upstream-commit: 9429fe6f49a4396cdd0ab2f0b88240ff0239a070
Component: engine
 2014-05-23 21:15:44 +02:00
Victor Vieux 44b4ad54dc Merge pull request #6008 from rhatdan/umount 
We need to umount /var/lib/docker when the daemon exits.
Upstream-commit: 0874b856271a4d5c05cfcbaa1efac482e7a91bc3
Component: engine
 2014-05-23 12:01:38 -07:00
Victor Vieux 373cdb1136 Merge pull request #5993 from LK4D4/fix_race_on_stop_#5154 
Add synchronization between jobs and server closing
Upstream-commit: 494cbbec4456ec5b6ef7c9a787bbca7efd411639
Component: engine
 2014-05-23 11:31:10 -07:00
Michael Crosby 7dcc66f3df Update integration tests with --net flag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 581e8e891886e6db387ed27aabda7dd8f1d14174
Component: engine
 2014-05-23 11:31:01 -07:00
James Turnbull 05b5a11797 Merge pull request #5952 from nathanleclaire/patch-2 
Fix a few issues.
Upstream-commit: 973fae9d75e1c354dc6631172d041740a2f543bc
Component: engine
 2014-05-24 03:00:37 +10:00
Tianon Gravi 8c1e9a02ad Merge pull request #6012 from tianon/check-config-cgroup-subsystems 
Add more required cgroup subsystems to check-config.sh
Upstream-commit: 3c430e259980d5cbc61e79ff3d3508aadb2361e5
Component: engine
 2014-05-23 10:43:16 -06:00
Nathan LeClaire 2c5a72f5fe Fix a few issues. 
-single-dash => --double-dash for a few flags, and also there was a missing "B", as in "Container B".

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com> (github: nathanleclaire)
Upstream-commit: 1e74cd0e01009bfa8afb6058f748f282da5200d0
Component: engine
 2014-05-23 09:36:27 -07:00
Tianon Gravi cd12b8d562 Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0c0ffb777354ab0d65fdb92fac47272584b2d217
Component: engine
 2014-05-23 10:27:09 -06:00
Dan Walsh d454476d00 We need to umount /var/lib/docker when the daemon exits. 
Currently we are leaving it bind mounted on stop.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: a3ff8a98f770ae35103e3ce3c4221c00b4efcb7f
Component: engine
 2014-05-23 11:43:46 -04:00
James Mills c375228771 Updated installation docs for CRUX as a Docker Host. 
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
Upstream-commit: c0529e5fc1a50f6fff47646bcc2461aeef20f906
Component: engine
 2014-05-24 01:18:00 +10:00
James Turnbull 1a0d737a90 Merge pull request #5949 from nathanleclaire/patch-1 
Change single-dash flag usage to double-dash
Upstream-commit: a6577708abc9370cfe7603a543eb68ad0e37d7e3
Component: engine
 2014-05-23 13:43:23 +10:00
Michael Crosby d002ab21b5 Add wait flag to iptables 
Fixes #1573
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b315c380f4acd65cc0428009702f99a266f96c59
Component: engine
 2014-05-23 01:24:58 +00:00
Tibor Vass d04aaf0cbe Merge pull request #5997 from crosbymichael/add-hang 
Fix add hang when dest is .
Upstream-commit: be622a78dab5ca5ccfeec3a8def01f421a1a0c6b
Component: engine
 2014-05-22 17:48:51 -07:00
Michael Crosby e231f0ebed Merge pull request #25 from tiborvass/3960-add-file-hangs 
adding test for hanging ADD src .
Upstream-commit: 04e357d09fe63785364a6c8ee2435d409cf715a0
Component: engine
 2014-05-22 17:38:11 -07:00
Tibor Vass dae04453b9 adding test for hanging ADD src . 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 1ce5457d57d783d6c61557681970bf0977621e78
Component: engine
 2014-05-22 17:28:04 -07:00
Michael Crosby 0b384856c1 Fix add hang when dest is . 
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c8ada301baf66360af6a3445b7c2abd629da3fd1
Component: engine
 2014-05-23 00:26:38 +00:00
Michael Crosby 258b16035a Merge pull request #5995 from vieux/recur_nodes 
Add device nodes recursively
Upstream-commit: 3d78c49aab0829e6c3bcf63b2d7b2d162d11a11e
Component: engine
 2014-05-22 16:35:27 -07:00
Victor Vieux cb5e9c4323 update test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b6c65df093111072bb44d42d650b591adb1bbbe0
Component: engine
 2014-05-22 22:50:41 +00:00
Victor Vieux e0f1623f01 add recursive device nodes 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0abb52c7a97940dc17c45ac45226af8156d0e712
Component: engine
 2014-05-22 22:29:13 +00:00
Michael Crosby 2e4b87e141 Merge pull request #5994 from vmarmol/libcontainers-stats 
Make all cgroup stats output int64s instead of float64.
Upstream-commit: 24a58a66e3d54efab0feb52f81b07ca24c1c1136
Component: engine
 2014-05-22 14:24:14 -07:00
Victor Marmol c13069d05f Make all cgroup stats output int64s instead of float64. 
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 4a33a757d540acd059ac957542527d641548e2cf
Component: engine
 2014-05-22 20:53:36 +00:00
Alexandr Morozov 022fe9a0d3 Add synchronization between jobs and server closing 
Fixes #5154
Daemon waiting 15 seconds for finishing server jobs before shutdown. In
this time it doesn't accept new jobs. After this time, it shutdown
despite running jobs.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: f92d68a6cedd069c138ac83961ad54ceb937ebd0
Component: engine
 2014-05-22 22:54:49 +04:00
Michael Crosby 456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm 
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
 2014-05-22 10:54:05 -07:00
Tianon Gravi 4f40541082 Merge pull request #5967 from tianon/consolidated-mkimage 
Add new consolidated mkimage scripts
Upstream-commit: 8006f6583d38dbb87e9d525089c0e4d2f933f918
Component: engine
 2014-05-22 11:27:08 -06:00
unclejack 2ded043703 Merge pull request #5990 from alexlarsson/no-discard-mkfs 
devmapper: Don't enable discard during mkfs.ext4
Upstream-commit: 32c1e3005f9c938b73bfe4919e7b1a236cbb7111
Component: engine
 2014-05-22 19:38:21 +03:00
Alexander Larsson 3bbd8860d6 devmapper: Don't enable discard during mkfs.ext4 
There is no reason to do discard durink mkfs, as the filesystem
is on a newly allocated device anyway. Discard is a slow operation,
so this may help initial startup a bit, especially if you use a larger
thin pool.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 42708181b1976a768428568e664c566717ade8c4
Component: engine
 2014-05-22 09:23:52 +02:00
James Turnbull 8eeac92781 Merge pull request #5746 from ImJasonH/patch-1 
Update google.md
Upstream-commit: 7470ebf30b8b8bce03ae536cebbae71bfbe474f9
Component: engine
 2014-05-22 13:43:40 +10:00