docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
8,538 Commits 12 Branches 297 Tags
a608cc700f8a8b79eb7b0939461ccf6a1d235848
Commit Graph

8538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
a608cc700f Merge pull request #6048 from crquan/use-timeout-conn 
Use Timeout Conn wrapper to set read deadline for downloading layer
Upstream-commit: a86975f29bf997e708401e5a15ca08a488c40ec1
Component: engine
 2014-05-29 15:23:21 -07:00
Michael Crosby
ca7e9e9a58 Merge pull request #6096 from vishh/stats_strongtype 
Replaced fs.Stats() interface with fs.GetStats() which returns a cgroups.Stats strong type
Upstream-commit: 887ab7792290879c9226e81c178ebb8628383c41
Component: engine
 2014-05-29 15:23:01 -07:00
Vishnu Kannan
c82b5a7f36 Added a new method cgroups.GetStats() which will return a cgroups.Stats object which will contain all the available cgroup Stats. 
Remove old Stats interface in libcontainers cgroups package.
Changed Stats to use unit64 instead of int64 to prevent integer overflow issues.
Updated unit tests.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 72e6e5ff7edc9c054e154897a4c547d89c082293
Component: engine
 2014-05-29 20:16:49 +00:00
Michael Crosby
35a8824c9b Merge pull request #6105 from gdm85/master 
Do not consider iptables' output an error in case of xtables lock
Upstream-commit: 189c600b3ba36934c074eb6769e23989ef22fda7
Component: engine
 2014-05-29 11:06:25 -07:00
Michael Crosby
608e72d07a Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs 
Add ErrPrerequisites to improve misleading errors
Upstream-commit: e2935f9c1691efd0dbf65c8845c823fcdf9cd2e0
Component: engine
 2014-05-29 11:00:13 -07:00
Victor Marmol
7f7efc2579 Merge pull request #6098 from crosbymichael/retry-mount 
Handle EBUSY on remount
Upstream-commit: f65f1660c086946cfb5c82c9e7f61a665a7fcf7d
Component: engine
 2014-05-29 09:18:54 -07:00
Johannes 'fish' Ziemke
32c2485efa Add ErrPrerequisites to improve misleading errors 
There are two cases where we can't use a graphdriver:

1) the graphdriver itself isn't supported by the system
2) the graphdriver is supported by some configuration/prerequisites are
missing

This introduces a new error for the 2) case and uses it when trying to
run docker with btrfs backend on a non-btrfs filesystem.

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 75754e69f6cce80c34ebc72817ada0a807fd635a
Component: engine
 2014-05-29 17:09:55 +02:00
Giuseppe Mazzotta
ee4e3699c5 * do not consider iptables' output an error in case of xtables lock 
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com> (github: gdm85)
Upstream-commit: 5e3b643ce6f43d02fc7fe88eba41d583044a2efd
Component: engine
 2014-05-29 15:57:29 +02:00
Sven Dowideit
6a08eb7c32 Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images 
docs/installation/google: update to use container-vm images
Upstream-commit: 8622641b585d18476f1bc26e1bb5d4298cecf78f
Component: engine
 2014-05-29 11:41:43 +10:00
Johan Euphrosine
9e0e3e5d33 docs/installation/google: update to use container-vm images 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 456ba11d89b52f946d293489b52508a2e270f1a7
Component: engine
 2014-05-29 11:36:28 +10:00
Sven Dowideit
78e6e0a137 Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers 
updated documentation for mentioning images vs containers
Upstream-commit: b9619bf9579f97f006b165f39c5a31f6738e4ac7
Component: engine
 2014-05-29 11:23:53 +10:00
Robin Speekenbrink
62daf025f0 updated documentation for mentioning images vs containers 
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
 2014-05-29 11:20:41 +10:00
Michael Crosby
a8abe1db1c Handle EBUSY on remount 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5d04b9deafc5ce173364a24881f8e950c9430be0
Component: engine
 2014-05-28 18:10:50 -07:00
Victor Vieux
d45f77737e Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user 
SETUID/SETGID not required for changing user
Upstream-commit: b204b97c9adbaddd5b8cef3dc53cbee2a392b936
Component: engine
 2014-05-28 17:29:17 -07:00
unclejack
3efba6310d Merge pull request #5402 from SvenDowideit/dont-update-authors 
Don't add yourself to the AUTHORs file - its generated
Upstream-commit: 341a2b85beb04132814dfc884c25e425e4df20bd
Component: engine
 2014-05-29 02:00:29 +03:00
unclejack
d63e421f0f Merge pull request #6067 from SvenDowideit/go-fmt-s 
gofmt does not result in the same thing as go fmt -s, which is what travis uses
Upstream-commit: 745445ebb729617e9ec7907fd4d7e2467a857ba1
Component: engine
 2014-05-29 01:58:03 +03:00
unclejack
1c0d70cd24 Merge pull request #6090 from alexlarsson/fix-console 
Fix /dev/console
Upstream-commit: a8131c7354a77ba49ca6704c819527ae9b883e3b
Component: engine
 2014-05-29 01:09:33 +03:00
Alexander Larsson
503e230354 libcontainer: Don't create a device node on /dev/console to bind mount on 
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 7f5cd76824b500418ed168dfcfeb73de8badcb51
Component: engine
 2014-05-28 21:07:40 +02:00
Alexander Larsson
3731289bf5 Revert "Remove the bind mount for dev/console which override the mknod/label" 
This reverts commit ae85dd54582e94d36b146ab1688844ed58cc8df3.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 35d08bdd01e3c63414d7998efc0813803e2ba5d9
Component: engine
 2014-05-28 21:07:27 +02:00
unclejack
003f6776a9 Merge pull request #6076 from LK4D4/remove_collections_package 
Remove collections package
Upstream-commit: 2330be2adc1efe35b0f09af69287a5bd58ee7456
Component: engine
 2014-05-28 21:32:27 +03:00
Victor Marmol
ea766a12d8 Merge pull request #5868 from jhspaybar/5749-libcontainerroutes 
libcontainer support for arbitrary route table entries
Upstream-commit: 5e2af0713735d6724179540d4d1b0827ab8c4570
Component: engine
 2014-05-28 10:50:56 -07:00
William Thurston
fc7b9b154d Fixes #5749 
libcontainer support for arbitrary route table entries

Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
Upstream-commit: bf7f360dcac38037d5c4f9e2e90d01adc240ed2b
Component: engine
 2014-05-28 17:42:02 +00:00
Bernerd Schaefer
9a698bd723 SETUID/SETGID not required for changing user 
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
Upstream-commit: 0563453b918b47c1f9d1e05b8650d2c8bf7ac3af
Component: engine
 2014-05-28 16:41:48 +02:00
Bernerd Schaefer
a9a33a3f25 Add system.SetKeepCaps and system.ClearKeepCaps 
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
Upstream-commit: fd58524f81031eec112b5e9bd52bfaa186fc9c20
Component: engine
 2014-05-28 16:40:36 +02:00
Sven Dowideit
775ca94cb2 Merge pull request #5957 from cgwalters/manpage-typo 
docker-run.1: Fix typo 'priviledged'
Upstream-commit: f00c2e5007cb7843c2bcea53e4a86835d3d5a958
Component: engine
 2014-05-28 22:43:46 +10:00
Alexandr Morozov
9dd5fe97c9 Remove collections package 
It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com> (github: LK4D4)
Upstream-commit: 31f0a61a3dfabe363d08d4ff55e8a1efb29d84eb
Component: engine
 2014-05-28 13:59:45 +04:00
Derek
b049a6c181 Use Timeout Conn wrapper to set read deadline for downloading layer 
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
Upstream-commit: 02f4ae6c56474b1f4e747916812b38134d503349
Component: engine
 2014-05-27 22:50:04 -07:00
Sven Dowideit
f50254f41e Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries 
Replace 'private' with 'self-hosted' in a couple of places
Upstream-commit: 77ae37a3836997d215ed3f1750533a9815205695
Component: engine
 2014-05-28 14:39:05 +10:00
Victor Vieux
5ad05e83a8 Merge pull request #6069 from crosbymichael/dm-errors 
Return devmapper errors with additional text
Upstream-commit: e56cf35c29362d74f20b88a51e1b9b2c6ae74afd
Component: engine
 2014-05-27 19:15:59 -07:00
Michael Crosby
5ea7137278 Return devmapper errors with additional text 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 69640123826cf73d3d83182cb81e5de4ad0cc3a7
Component: engine
 2014-05-27 19:03:57 -07:00
Jérôme Petazzoni
8f1ec933f0 Replace 'private' with 'self-hosted' in a couple of places 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: b64535166f4e930121bf9cb624bf2d044c97e472
Component: engine
 2014-05-27 18:57:25 -07:00
SvenDowideit
17bb4fbe20 gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 147ad3480da6c9e966b1db0d9d607dc6b1483327
Component: engine
 2014-05-28 11:11:47 +10:00
O.S. Tezer
a398a30f36 Merge pull request #6053 from jamtur01/produpdate 
Removed Docker production warnings
Upstream-commit: d53eb2f67cbdd632d6e4cad8de9d8f654baa96a3
Component: engine
 2014-05-27 18:00:49 -07:00
Sven Dowideit
ea93628b07 Merge pull request #6044 from zdover23/27May_dockerfile_2 
27 may dockerfile 2
Upstream-commit: 58a0e8af8af0989139a3d3c6c3cae1fc30ae24de
Component: engine
 2014-05-28 07:58:02 +10:00
Sven Dowideit
f0d03df9d1 Merge pull request #6040 from SvenDowideit/installer-docs 
Rewrite the mac and windows docs to use the boot2docker installers.
Upstream-commit: b76302e5d91da7b66fe0141f4a67636074c886a9
Component: engine
 2014-05-28 07:57:43 +10:00
SvenDowideit
9f78769fba Rewrite the mac and windows docs to use the boot2docker installers. 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5f5d66ade63f8040dd14114f2c7161b16a806c5c
Component: engine
 2014-05-28 07:56:15 +10:00
Sven Dowideit
2d2f74e79d Merge pull request #6005 from jimperrin/master 
Updated documentation to include CentOS installation instructions.
Upstream-commit: 080d8a7a8367dcf7bdbcac00ec99fbfb05c7ab51
Component: engine
 2014-05-28 07:55:03 +10:00
unclejack
2296bc83e2 Merge pull request #6063 from vieux/improve_number_detection 
improve numeric only id detection
Upstream-commit: 70c6d806c8f43a91a324a352f69648a47c843335
Component: engine
 2014-05-28 00:36:57 +03:00
Victor Vieux
875520071b Merge pull request #6062 from crosbymichael/update-waits 
Update wait calls to call Wait on Command
Upstream-commit: b8a89ba9639fcf5528ae77af473c7d58c1251c70
Component: engine
 2014-05-27 14:17:19 -07:00
Victor Vieux
dc559e048a improve numeric only id detection 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f2baa364a13ea3e22719e3637bf6f5f42e5dc677
Component: engine
 2014-05-27 21:03:12 +00:00
Michael Crosby
0ef8d97b63 Update lxc to use cmd.Wait() 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5310e8575f5a251000bbecd6d998eb11cb95fe04
Component: engine
 2014-05-27 13:52:05 -07:00
Michael Crosby
562071c97e Update wait calls to call Wait on Command 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b9de22e82860a7e389f356d349ccb61b7d530c54
Component: engine
 2014-05-27 13:38:24 -07:00
Victor Vieux
e0a89dbf86 Merge pull request #6059 from erikh/fix-tests 
Fix race condition in CLI tests: diff was not acquiring a container lock
Upstream-commit: a60537992710edce4095b987f6e19ad0aea34ffa
Component: engine
 2014-05-27 13:19:32 -07:00
unclejack
37b20aec53 Merge pull request #6025 from crosbymichael/concurrent-names 
Improve name generation on concurrent requests
Upstream-commit: 0d9a5ce6dd061089a3a485bf359a054d83b74059
Component: engine
 2014-05-27 23:18:19 +03:00
Michael Crosby
1433e4bab9 Merge pull request #6030 from erikh/5971-fix-zombies 
Add Wait() calls in the appropriate spots
Upstream-commit: 88cefe20b40d91b998fb12c92a5a4ef445f3ab15
Component: engine
 2014-05-27 12:53:17 -07:00
Erik Hollensbe
3ed3d24076 Fix race condition in CLI tests: diff was not acquiring a container lock 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 8b77e0183eaa7b3a87921f9655e2799d300bf775
Component: engine
 2014-05-27 12:28:31 -07:00
Erik Hollensbe
efa2549ad1 libcontainer/nsinit: remove Wait call from Exec and Kill from Attach in tty_term.go 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: b01c3283fafa01228a566e128dbf4b016c308d04
Component: engine
 2014-05-27 12:26:56 -07:00
Erik Hollensbe
05b57dfef1 Add Wait() calls in the appropriate spots 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 92e41a02ce40c7d3446b8ca7ec5c5671ac3d8917
Component: engine
 2014-05-27 12:26:56 -07:00
Michael Crosby
3feecdd11d Merge pull request #5937 from LK4D4/ipallocator_refactoring 
Ip allocator refactoring
Upstream-commit: bdb5aa4c27b375cc8cd59fd6fa26ec10c23e58f9
Component: engine
 2014-05-27 12:22:36 -07:00
Victor Vieux
16451e9bb0 Merge pull request #6051 from LK4D4/move_some_build_tests_to_integration_cli 
Move some build tests to integration cli
Upstream-commit: b904d0af561eab7a1663d20e913c3fd720118a0a
Component: engine
 2014-05-27 12:11:42 -07:00