toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

20395 Commits

Author SHA1 Message Date
Sven Dowideit
12ddd522ae Merge pull request #4755 from crosbymichael/add-size-to-history-docs 
Add image size to history docs
Upstream-commit: 9e1306f78f3d3856126955c1945a32eaf190d705
Component: engine
 2014-03-19 09:32:35 +10:00
Johan Euphrosine
433a941c61 libcontainer: remove duplicate imports 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 5dbfe310fe624c66714f8c5017692f528af4c87f
Component: engine
 2014-03-18 16:25:26 -07:00
Michael Crosby
2374c7e198 Add image size to history docs 
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 041ae08a2c8f6f345ac0d7f5fea4b79655e28dc5
Component: engine
 2014-03-18 16:24:45 -07:00
Johan Euphrosine
bf68195445 libcontainer: goimports 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: f58757a699cf47c3b8770e13f371e1bbf493b5b1
Component: engine
 2014-03-18 16:18:34 -07:00
Johan Euphrosine
05b01b0f64 libcontainer/nsinit/init: move mount namespace after network 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: b10b950b110c93db34a399753706dc79c71b94d3
Component: engine
 2014-03-18 16:18:04 -07:00
Johan Euphrosine
c37f607a5b libcontainer/network: add netns strategy 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: f52b2fdcbb29258c5b492fdb2479d473fcb42ca0
Component: engine
 2014-03-18 16:17:28 -07:00
Michael Crosby
c9b7a0a568 Merge pull request #4744 from LK4D4/fix_issue_#3565 
Using names in docker ps --since-id/--before-id, resolves #3565
Upstream-commit: 22c18de7bed169792213843476d06dedbd1ba387
Component: engine
 2014-03-18 15:39:56 -07:00
Tianon Gravi
f8d8a57e3d Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart 
Add upstart nofile/noproc similar to systemd init
Upstream-commit: 119839dfd7b8b77eb22ccd45116f45a4bc17a1a6
Component: engine
 2014-03-18 15:30:30 -06:00
Sven Dowideit
7d90dd284a Merge pull request #4740 from vojnovski/patch-1 
Update ubuntulinux.rst
Upstream-commit: 06d87fd54009aa6a0d420e45bb8df11a7dea31c3
Component: engine
 2014-03-19 06:48:57 +10:00
Brian Goff
463aedf3de Add upstart nofile/noproc similar to systemd init 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e27c635c06dcad61ce7185d95debef9ef7c9f7e0
Component: engine
 2014-03-18 16:27:20 -04:00
LK4D4
5ac53676ce Using names in docker ps --since-id/--before-id, resolves #3565 
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
 2014-03-18 23:30:21 +04:00
Guillaume J. Charmes
9f3a8a726d Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop 
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
 2014-03-18 11:28:42 -07:00
Michael Crosby
4879ef6f17 Merge pull request #4733 from vieux/3729_time_exit 
add time since exit in docker ps
Upstream-commit: 1e56ec8b67e77a1e99f12b7e7c04245477202c9c
Component: engine
 2014-03-18 11:25:11 -07:00
Vincent Batts
e8fa51d05e typo 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: c76def2dd23cf90fdc80224f08530205b6dcba73
Component: engine
 2014-03-18 13:46:38 -04:00
Vincent Batts
7a2dc6bc24 packagers: btrfs build tag docs 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 29c45e7f4fc616290e416f1b541e1739820af60c
Component: engine
 2014-03-18 13:45:36 -04:00
Vincent Batts
856d46eee0 btrfs: build tags 
correct filename and make the tag more readable

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5cfea26bcfc218ca72eac7115fa257833f28b9f2
Component: engine
 2014-03-18 13:44:23 -04:00
Vincent Batts
cdf7c6a1a7 btrfs: build tags 
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver

	go build -tags no_btrfs' ...
	$ go build
	$ objdump -S docker | grep btrfs | wc -l
	194
	$ go build -tags no_btrfs
	$ objdump -S docker | grep btrfs | wc -l
	1
	# that is a comment ;-)

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 85a62d9b779bfb351e159f38c2fc95900a0532cd
Component: engine
 2014-03-18 13:44:22 -04:00
Andy Kipp
7976f94412 Add err checks for port allocator tests 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 555416fd02b9e062385dcdaf0c4b9f5de61df388
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
0ed607c3a6 Be more explicit in finding next port to allocate 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 73c416a20db8fe48302a6cf0db4c1c0585ed0739
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
9ecda2cf3a Better test error message 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 7a1db291fcedd50ce99649e95109187c76da255c
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
dc2e6deab9 Prevent dynamic allocation of previously allocated ports 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: f7b6fbbd7664634481c8519e58844d572423f3e1
Component: engine
 2014-03-18 13:30:21 -04:00
Victor Vieux
afc3313920 Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags 
graphdriver: build tags
Upstream-commit: f14c0866ecb5ee38be8d6859ced730d431610743
Component: engine
 2014-03-18 10:25:59 -07:00
Guillaume J. Charmes
2e49d88eb6 Merge pull request #4739 from alexlarsson/dm-timeout 
devmapper: Increase timeout in waitClose to 10sec
Upstream-commit: 8ac6400749f6a000891b18ca1d36c10c8b7461d8
Component: engine
 2014-03-18 10:12:59 -07:00
Viktor Vojnovski
c798edd116 Update ubuntulinux.rst 
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
Upstream-commit: ae1dd52b19d075c2f4ba75cf0549c644725834e8
Component: engine
 2014-03-18 17:10:22 +01:00
Alexander Larsson
186bfcdec8 devmapper: Increase timeout in waitClose to 10sec 
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a70beda1ecfb049a3f80ad5b159ba51d653fd067
Component: engine
 2014-03-18 15:54:40 +01:00
Sven Dowideit
fb7b463fb2 add env hint 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e5cbb5c906d37b14dbf0180d253f58f8995de571
Component: engine
 2014-03-18 22:29:11 +10:00
Michael Crosby
eb110a5588 Merge pull request #4731 from crosbymichael/fix-execin 
Only unshare the mount namespace for execin
Upstream-commit: 3782900405c20e812d80f339c63844c0228cb74a
Component: engine
 2014-03-17 18:59:26 -07:00
Vincent Batts
b02e8511f3 runtime: no build tags for vfs driver 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 448b64164df7795cdbd9be0d663269e6e4e4beeb
Component: engine
 2014-03-17 21:54:43 -04:00
Vincent Batts
0ba8b13022 graphdriver: build tags 
Enable build tags for all the graphdrivers to be excludable.

As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 670ce98c60dbac1d46a59bd69bd20b569f4794f1
Component: engine
 2014-03-17 21:54:05 -04:00
Michael Crosby
2d58b8bf60 Only unshare the mount namespace for execin 
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4b1513f9c394fbfdf21998db4318251b4e8b6bc0
Component: engine
 2014-03-17 18:52:56 -07:00
Tianon Gravi
e398c4200d Add some documentation about relative WORKDIR values 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 69299f041f78f8a86bf810142e740bbd72fe4b1b
Component: engine
 2014-03-17 19:42:27 -06:00
Tianon Gravi
1cf125633c Improve WORKDIR test to cover more edge cases 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c1f492755b8774005b3627da8ee001ee0b2df4eb
Component: engine
 2014-03-17 19:42:13 -06:00
Victor Vieux
bf660d94fc add time since exit in docker ps 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 15a267b57d2394dd5cb697f9a80b6df4fc939a76
Component: engine
 2014-03-18 01:34:43 +00:00
Guillaume J. Charmes
3865d7d383 Merge pull request #4661 from vieux/add_no_prune 
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
 2014-03-17 16:07:55 -07:00
Andrea Turli
c319c89d0b address comments from @jamtur01 
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
Upstream-commit: 8b159fca8a4bc8692c77db3536f7098a583270ad
Component: engine
 2014-03-17 23:39:35 +01:00
unclejack
0aaef1f844 Merge pull request #4710 from jimenez/4680-timeout_flag-fix 
Disable timeout
Upstream-commit: fb503da34e2eae1aab3a54eed4c5a2374fa35c7d
Component: engine
 2014-03-18 00:38:39 +02:00
Victor Vieux
c4297c670a Merge pull request #4702 from timthelion/Issue#4681-1 
Fix Issue#4681
Upstream-commit: 30541ade821392710edb5bbdd72bd1d1c246e04b
Component: engine
 2014-03-17 15:31:54 -07:00
Andrea Turli
d845687a9e add softlayer installation instructions 
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
Upstream-commit: 782eb5f03a9dde970172895da37be8c656fef3bd
Component: engine
 2014-03-17 23:19:47 +01:00
Isabel Jimenez
e839931238 adding configuration for timeout and disable it by default 
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
Upstream-commit: 25218f9b239784e6f38550a6e320bce56aaca3e1
Component: engine
 2014-03-17 15:12:02 -07:00
Timothy Hobbs
ff82619b66 Refactor out interface specific information from execdriver.Network 
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 659b719aa66e7ed0c3104d3704fa61035050ad82
Component: engine
 2014-03-17 22:53:48 +01:00
Sven Dowideit
431a7612ca Merge pull request #4689 from ralphbean/patch-1 
Update fedora.rst
Upstream-commit: 865310e99daf93002b233cf7d4d5c2d1ac40c3ae
Component: engine
 2014-03-18 07:49:48 +10:00
Timothy Hobbs
ccebbeffe2 Fix issue #4681 - No loopback interface within container when networking is disabled. 
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Remove loopback code from veth strategy

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Use append when building network strategy list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Swap loopback and veth strategies in Networks list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Revert "Swap loopback and veth strategies in Networks list"

This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

When initializing networks, only return from the loop if there is an error

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 353df19ab7009f6555dee506841ae0b690a08768
Component: engine
 2014-03-17 22:01:24 +01:00
Timothy Hobbs
73c73fe476 Add failing test case for issue #4681 
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 53c5b1856d91093fed1c2d3f038d227f5fdef4b8
Component: engine
 2014-03-17 22:01:24 +01:00
Guillaume J. Charmes
c6aab2eaa4 Merge pull request #4723 from vieux/fix_panic_monitor 
fix panic in monitor
Upstream-commit: dd040c98706cd8ee3022061a63dc064b31fff890
Component: engine
 2014-03-17 13:52:22 -07:00
unclejack
ec6d6bab54 Merge pull request #4721 from vieux/4716-display_ps-fix 
Fix display command display in docker ps
Upstream-commit: 0e92c7c24a64a4cc36b38ffb35f3e8498bcb1790
Component: engine
 2014-03-17 22:04:00 +02:00
Victor Vieux
06d35a04d8 fix panic in monitor 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1dfc44073399aadb226c1b4c1909fb15c033d44a
Component: engine
 2014-03-17 19:33:40 +00:00
Victor Vieux
2f4b69fe2b fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf
Component: engine
 2014-03-17 19:17:40 +00:00
Brian Goff
511a3e0407 Disable automatic killing of containers when docker stop fails 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5
Component: engine
 2014-03-17 15:15:44 -04:00
Michael Crosby
8d099b8012 Gofmt imports 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
 2014-03-17 11:41:28 -07:00
Victor Vieux
d986adda7d Add missing client doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a18d08177c1b11fd1e88c27d78a7256b5d498d64
Component: engine
 2014-03-17 18:40:57 +00:00