1
0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Commit Graph

10644 Commits

Author SHA1 Message Date
Alexandr Morozov
750e7b6a57 Change unused WriteCloser to Writer
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: fd3f2e175fa6ddb606d2c681ff86a97faccfebbd
Component: engine
2014-09-22 10:54:58 +04:00
Sven Dowideit
3ebe7ce35b Merge pull request #8124 from jyrkiput/patch-1
Fix detaching from attached container
Upstream-commit: 27226d47c17588c867f2c533b87977955f2ca66e
Component: engine
2014-09-22 09:28:10 +10:00
Sven Dowideit
d9f35e7ede Merge pull request #8151 from shazow/sort-exec-docs
Cleanup: Fixed cli docs' command header sorting
Upstream-commit: 23fdbbfee4800b7353953adba3891bd3554431c4
Component: engine
2014-09-22 09:21:38 +10:00
Andrey Petrov
c2a971c0cd Cleanup: Fix cli docs: Sorted command headers.
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net>
Upstream-commit: c5805c8772b2439ce9d8c7022bd8c8208648bc5b
Component: engine
2014-09-20 18:10:11 -07:00
Alexandr Morozov
d3a449f426 Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
Split volumes out from daemon
Upstream-commit: e7a9662974ad12e1926599e64dca44aaf1a90145
Component: engine
2014-09-20 16:23:20 +04:00
Alexandr Morozov
b795807b6a Merge pull request #8144 from crosbymichael/reduce-logging
This reduces the amount of logging in the integration tests
Upstream-commit: f8c998c605ff1a6f11d371a94820e49ce815d769
Component: engine
2014-09-20 11:17:03 +04:00
Michael Crosby
3a9c8d29c9 This reduces the amount of logging in the integration tests
There were a new areas in the brige driver that did not need to have log
output.  Those were removed.  Also set the engine's logging to false
when running the integration tests.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8a9e827216eb5db4fcbe67c3c638f9e85f4de9bf
Component: engine
2014-09-19 17:30:37 -07:00
Jessie Frazelle
6ce5061aaf Merge pull request #8139 from aluzzardi/fix-drone-integration-goenv
Fix drone integration
Upstream-commit: 11446d30f798c3568343b306cc74644d09a66e60
Component: engine
2014-09-19 16:05:52 -07:00
Brian Goff
1ce355084d Split volumes out from daemon
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 45407cf00af95b04dd2ff11ce330dd397bf1e095
Component: engine
2014-09-19 17:47:47 -05:00
Andrea Luzzardi
05552c0632 Drone Config: Disable integration-cli/docker_cli_exec_test as it breaks.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 07cedaab8640a68c480cb90722cb08fcf0a2c043
Component: engine
2014-09-19 15:40:48 -07:00
Andrea Luzzardi
f94b4ccad2 Drone Config: Use AUTO_GOPATH instead of hacking around.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 72fe4c8daa86158fef97dceb1bae6395c2b4e05e
Component: engine
2014-09-19 15:20:35 -07:00
Jessie Frazelle
0539887817 Merge pull request #8129 from vbatts/vbatts-archive_comments
archive: adding comment to exported functions
Upstream-commit: ba726d9148ee616f0ad069bff6c7732815beb6c6
Component: engine
2014-09-19 14:36:52 -07:00
Tianon Gravi
69e9467696 Merge pull request #8130 from aluzzardi/f-drone-integration
Add drone.io configuration
Upstream-commit: 77193089d8b7dba9e3a045e9e58b65466f6a3c3a
Component: engine
2014-09-19 14:59:40 -06:00
Tibor Vass
cb5b85db40 Merge pull request #8133 from crosbymichael/update-libcontainer-sep7
Update libcontainer to 185328a42654f6dc9a41814e578
Upstream-commit: 7fafe170cfdf9ba96b6eabe03e06a53199d386db
Component: engine
2014-09-19 14:58:51 -04:00
Michael Crosby
6e1d9ca051 Merge pull request #8131 from unclejack/fix_perm_detection
integcli: fix permission detection for aufs
Upstream-commit: 63c8b8bf302d945d9e0dd974f2dbe55b78e59995
Component: engine
2014-09-19 11:55:56 -07:00
Jessie Frazelle
97ca9c8cb5 Merge pull request #8134 from LK4D4/prefix_naming_cli
Prefix naming integration-cli tests
Upstream-commit: a8e964ebb2873c76a4ed6bd44114449630b849a3
Component: engine
2014-09-19 11:54:04 -07:00
Michael Crosby
c085c947d2 Merge pull request #8118 from tiborvass/merge-8031
FIX 6613:launch docker fail with space named drive (squashed commits from 8031)
Upstream-commit: c41bc790986137f8f6dad97f7567a3371d0b0b3e
Component: engine
2014-09-19 11:44:43 -07:00
Michael Crosby
fee8abc42e Update libcontainer to 185328a42654f6dc9a41814e578
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2531fba389c8bd25ed1ec7bea38f0ee19c974a26
Component: engine
2014-09-19 11:21:44 -07:00
Erik Hollensbe
a8de7f8c26 Merge pull request #8128 from bfirsh/two-level-cli-commands
Add support for multiple level CLI commands
Upstream-commit: 41f2b3c6bc6971c689f08fbe80b14f7dd0f9550f
Component: engine
2014-09-19 11:14:36 -07:00
Alexandr Morozov
0766eee2fa Use prefix naming for rmi tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2e2422b0eb163829127692250973472456d0ed77
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
c622ad158e Use prefix naming for rm tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: cc54b77fce1ab0d6bfa78947ee46ffdd104f21c5
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
4884c0c1a5 Use prefix naming for restart tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 1ddd013b194d7f551547bd2940a92ba3db72f95e
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
7983e51d5c Use prefix naming for ps tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 00b82fcab6492a853958a3a5f43f95469a60e12f
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
2a20f56a59 Use prefix naming for port tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6e8c9e7bee5319b1e324c72240ef9d7a77946135
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
0476801567 Use prefix naming for links tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b6325907e9de4020381ad1d016614f819da58cc6
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
d8c88456d9 Use prefix naming for create tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 27a27b73880c4e79d23b65c9032264a4a8fca1cd
Component: engine
2014-09-19 22:11:54 +04:00
Alexandr Morozov
6e01160f0a Use prefix naming for build tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 66cd3640f16f5b91893dacd6de3f8c5ae55e2f2c
Component: engine
2014-09-19 22:11:50 +04:00
unclejack
987f4f8cee integcli: fix permission detection for aufs
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1a0347ff1dd1035066b5faf86db0587491b5d638
Component: engine
2014-09-19 21:08:57 +03:00
Vincent Batts
32e1dc80f1 archive: adding comment to exported functions
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0fe56ce1b97736c374d3d649d2df0a19f3b2884f
Component: engine
2014-09-19 14:02:12 -04:00
Andrea Luzzardi
f32be6203d Add drone.io configuration
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ed072ed71dfbd3539d769fc2aa882f6029b7bc64
Component: engine
2014-09-19 11:00:28 -07:00
Alexandr Morozov
2941f9c6d5 Use prefix naming for attach tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: f312f784e18f3a0a087e615162c1e38b1bae8e51
Component: engine
2014-09-19 21:56:25 +04:00
Alexandr Morozov
1d842ff63a Use prefix naming for inspect tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3812a6a8466f639cfd538c05c3ff2730a70b1440
Component: engine
2014-09-19 21:56:25 +04:00
Alexandr Morozov
0103b6d058 Use prefix naming for events test
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 9720078f9e299f6b7207060599c322a58fc9b8b8
Component: engine
2014-09-19 21:56:25 +04:00
Alexandr Morozov
1390b58ea2 Use prefix naming for docker_cli_run_test.go
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: aa536b27a7897373384ab0335c44f44b0bb83455
Component: engine
2014-09-19 21:56:24 +04:00
Ben Firshman
93e967ece5 Add support for multiple level CLI commands
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: e1b968f1981f21470a67ed617c36f1c6802bd0a7
Component: engine
2014-09-19 10:43:50 -07:00
Jyrki Puttonen
bec783657b Fix detaching from attached container
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md

Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com>
Upstream-commit: 1d2a1598c54d9ca8d3d02ec5e7b0231a8cf153d3
Component: engine
2014-09-19 19:34:05 +03:00
Guillaume Dufour
9e6770baa4 FIX 6613:launch docker fail with space named drive
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: acea488eb6ed40e6e5894e1b259ad861c9a98042
Component: engine
2014-09-19 12:07:53 -04:00
Erik Hollensbe
cbc12688b3 Merge pull request #8076 from duglin/MultiCopyAdd
Add support for copy/add with multiple src files
Upstream-commit: e91de29e0818b40adec155c3353e510d7bcf87b5
Component: engine
2014-09-19 09:01:29 -07:00
Sven Dowideit
639ef06c02 Merge pull request #8091 from jfrazelle/exec-main-manpage
Add docker-exec to main manpage
Upstream-commit: 39ed048aabbc9e2c2981339ce02169d79c6c4f1c
Component: engine
2014-09-19 16:17:11 +10:00
James Turnbull
c01755f5a3 Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit
boot2docker shellinit will set any and all env vars needed.
Upstream-commit: 742eb7e0018e192b1ca32a045ec053c22261aecb
Component: engine
2014-09-19 00:46:15 -04:00
Doug Davis
55b8ec78cc Add support for copy/add with multiple src files
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 05b8a1eb363ce03a9dfa3315fbac59c42af2df54
Component: engine
2014-09-18 20:12:13 -07:00
Michael Crosby
5503a73c31 Merge pull request #7694 from eyakubovich/master
Add an option to disable IP masquerading
Upstream-commit: 72e901559177a4a49f82779dbaa108487dce086d
Component: engine
2014-09-18 18:33:45 -07:00
Michael Crosby
1192584d04 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5
Fix duplicate iptables rules
Upstream-commit: d5537e0f039512c322efa6aec176349eff731499
Component: engine
2014-09-18 17:51:15 -07:00
Sven Dowideit
be7f27050e Merge pull request #8061 from SvenDowideit/document-image-tarball-format
Add a little description of the image tarball format.
Upstream-commit: 82aa895c6dc592809d97284744dbd90c869097c5
Component: engine
2014-09-19 10:32:13 +10:00
Jessie Frazelle
c86477a1f5 Merge pull request #8111 from acroca/master
Grammar fix
Upstream-commit: 031231b5ed6993f6de88bca636a2b939677a3197
Component: engine
2014-09-18 17:27:24 -07:00
Sven Dowideit
eec790d02f boot2docker shellinit will set any and all env vars needed.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 77975722492adcd791e1210a12e5f58fa81c29e8
Component: engine
2014-09-19 10:20:12 +10:00
Albert Callarisa
b339cb93d3 'an file' -> 'a file' grammar fix
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
Upstream-commit: 4e11902d05816ba76e15f4af91dd4c507946072e
Component: engine
2014-09-19 08:12:33 +08:00
Alexandr Morozov
8ff5b7820a Merge pull request #8115 from vishh/exec_panic_fix
Initialize execStore while restoring a container from checkpoint.
Upstream-commit: e909bbccc3bcd37d48509e9e2fb4fa61a93a833b
Component: engine
2014-09-19 02:22:51 +04:00
Jessica Frazelle
5770448fc1 test for panic on daemon restart
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 42dafe4bd84842532361a2d704493d124f438ab1
Component: engine
2014-09-18 21:54:42 +00:00
Vishnu Kannan
924f51b1d5 Initialize execStore while restoring a container from checkpoint.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 003afaf1ce9f9d2983c84093fb00f4b68a99b0fa
Component: engine
2014-09-18 21:40:53 +00:00