docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
18,015 Commits 12 Branches 296 Tags
45692d9652faae08d70b502e41bf5d22f9eca1e7
Commit Graph

93 Commits

Author SHA1 Message Date
Brian Goff
bfe1bbc7d2 Add volume API/CLI 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
 2015-08-26 13:37:52 -04:00
Brian Goff
c1608c666a Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers 
Fix restart docker daemon with paused containers
Upstream-commit: 2cec06fbcd0b4cb6107ae432d92c3997075a4035
Component: engine
 2015-08-26 09:04:14 -04:00
Lei Jitang
ef9b8937c0 Fix docker daemon restart with paused container. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9a9724ad5616dc1a29efabe8082bde043c1a2bc9
Component: engine
 2015-08-25 09:42:58 +08:00
Brian Goff
83ec490c79 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy 
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
 2015-08-24 13:48:56 -04:00
Tonis Tiigi
2bf42179ec Add unless-stopped restart policy 
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
 2015-08-18 11:39:06 -07:00
Alexander Morozov
8deea878c7 Fix LogConfig.Config in inspect 
Also add test for daemon-wide log-opt.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
 2015-08-17 15:27:44 -07:00
Alexander Morozov
03328caba1 Check syslog config on daemon start 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
 2015-08-17 14:29:45 -07:00
Veres Lajos
2c6e673ce7 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
 2015-08-07 23:25:49 +01:00
John Howard
9416fd6ce9 Windows: Workaround for CI 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
 2015-08-05 11:20:30 -07:00
Antonio Murdaca
ba8c4244c7 test: daemon restart with containers running with restart always policy 
manually stopped

If a container is running with a restart policy of always and it's
manually stopped, then on daemon restart it will be running.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: af59c80b4afb2448927f56df2029eec0ae81b00c
Component: engine
 2015-08-02 11:14:01 +02:00
David Calavera
da82af9892 Merge pull request #15185 from aboch/vnd_lbn_1.8 
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Upstream-commit: 9e9f3aa36b5286556c8f99557d8bcc66946598d3
Component: engine
 2015-07-31 08:58:41 -07:00
Doug Davis
1d4ee6ca42 Add a test to make sure that --tlsverify=false turn on tls in daemon 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5ced3ab3236bfe8ade1b5b6663599518086af7da
Component: engine
 2015-07-30 21:21:24 -07:00
Alessandro Boch
40d1455b2e Add test code to cover issue #14859 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4964ab08218f3b40f5c3a6bf19fe74f7fb39562a
Component: engine
 2015-07-30 17:37:11 -07:00
Brian Goff
6e14356132 Don't pass check.C to dockerCmdWithError 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 693ba98cb9118bf15caaabc69ca281c0ce604226
Component: engine
 2015-07-27 14:33:32 -04:00
Shishir Mahajan
4f814a612a Add and modify tests for legacy and new daemon invokations 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e7fc632147e40f5a243158e8378082c51a3d952e
Component: engine
 2015-07-23 20:31:43 -04:00
Ben Firshman
6aa4de764e Fix golint warnings for integration-cli 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 6b3c928140193f911b73f87bb8b07f54bba5a63a
Component: engine
 2015-07-22 14:03:50 +01:00
Sebastiaan van Stijn
2d8d0361a7 Merge pull request #13711 from calavera/version_volumes_inspect 
Expose new mount points structs in inspect.
Upstream-commit: 50d2597e490c4636ee8cacabf34bb9ed3e21d3fc
Component: engine
 2015-07-22 09:02:00 +02:00
David Calavera
b821d19c27 Expose new mount points structs in inspect. 
Keep old hashes around for old api version calls.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1c3cb2d31ea722e2c174bf78eda62fec6949fb8b
Component: engine
 2015-07-21 15:33:05 -07:00
Qiang Huang
0b00c6ae1a dockerCmd when possible 
Addresses: #14603

integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 668e2369cc5d57d634d0e559241ea4c4cbde65d8
Component: engine
 2015-07-20 14:55:40 +08:00
David Calavera
7f87043716 Merge pull request #14294 from mavenugo/bnone 
fixed incorrect assumption on --bridge=none treated as disable network
Upstream-commit: a2621ac6dacf87bf713ac327f7c0e14eb77e52bc
Component: engine
 2015-06-30 13:40:52 -07:00
Madhu Venugopal
521162c904 fixed incorrect assumption on --bridge=none treated as disable network 
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: c9328c6ccf120abda297d11fcfc7e60c7c31ec21
Component: engine
 2015-06-30 13:04:28 -07:00
Dave Tucker
eada1cc719 integration-cli: Add Tests for IPv6 and Fixed CIDR 
This patch adds tests for the `--ipv6` and `--fixed-cidr` daemon flags

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 2dfb7f3b7d66e49841cf07aa11943b74312222a3
Component: engine
 2015-06-29 14:45:00 +01:00
Brian Goff
69ff11d75b Fix DOCKER_TLS_VERIFY being ignored 
DOCEKR_TLS_VERIFY was being ignored because we were just checking if the
`-tlsverify` flag was set, not the actual value, which is defaulted to
the value of `os.Getenv("DOCKER_TLS_VERIFY") != ""`

The problem that this specifically fixes is where the client has set the
`DOCKER_TLS_VERIFY` env var but is connecting to a daemon that is not
verifed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5a6a33f7acccc7394a5ac418e777d5a6e1d1b7ed
Component: engine
 2015-06-16 12:04:00 -04:00
Michael Crosby
0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
 2015-06-09 17:24:30 -07:00
Jana Radhakrishnan
2ee4e129d1 libnetwork: Add garbage collection trigger 
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Component: engine
 2015-06-07 21:33:51 -07:00
Eric-Olivier Lamey
9644714f56 Restore --default-gateway{,-v6} daemon options. 
This was added before the libnetwork merge, and then lost. Fixes #13755.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Component: engine
 2015-06-05 06:21:22 +00:00
David Calavera
4610cc7a2b Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown 
Ensure all the running containers are killed on daemon shutdown
Upstream-commit: 04c6f09fbdf60c7765cc4cb78883faaa9d971fa5
Component: engine
 2015-05-29 16:45:57 -07:00
Jessica Frazelle
fefb50c37a skip test on lxc 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 1392f99a974bd03848b1080a263db2b7def2fc02
Component: engine
 2015-05-28 14:54:12 -07:00
Lei Jitang
6aa7cf16be Ensure all the running containers are killed on daemon shutdown 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: bdb77078b5b93c3075aa258e1c04a5a5c893430f
Component: engine
 2015-05-27 09:09:25 +08:00
Alexander Morozov
7623ba5e39 Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3cb14df68c1a59981907fec3bccab80a1d0dda59
Component: engine
 2015-05-24 08:26:59 -07:00
David Calavera
89782c55eb Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
 2015-05-21 20:34:17 -07:00
Jessie Frazelle
03f7a130a4 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan
13426de5e6 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Jessie Frazelle
f0cacf3e79 Merge pull request #12437 from fmzhen/remove-regex-replace 
Removal of the regex to replace ips
Upstream-commit: 92c869cd12313c8832584c1eb671577d070f8a5b
Component: engine
 2015-05-19 22:59:17 +02:00
Alexander Morozov
8911352f54 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
 2015-05-19 09:32:23 -07:00
Mingzhen Feng
2d7bfa2f2c Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
 2015-05-19 10:15:18 +08:00
Doug Davis
2095b80959 add link between -D and --log-level=debug back in 
Due to popular demand :-)
See #11965

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a85ca8b7c40f05f2b6471cc30fb8d5271605c1d1
Component: engine
 2015-05-14 10:29:49 -07:00
Antonio Murdaca
af27a9480d Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
 2015-05-13 05:23:56 +02:00
Jessie Frazelle
d58b604612 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
 2015-05-12 18:24:04 -07:00
Doug Davis
2e83148ffd Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
 2015-05-12 17:22:41 -07:00
Alexander Morozov
6da49015e7 Fix api servers creation and daemon start order 
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
  /var/run/docker.sock by some container

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 08230703fdd0f7bcd9a87a0d61d88fdf2b901e66
Component: engine
 2015-05-07 15:38:02 -07:00
Tibor Vass
203abf3991 Merge pull request #12771 from runcom/say-bye-to-engine 
Remove engine
Upstream-commit: 0d0b42547e74e183c7c459a13877bd27c21dba0c
Component: engine
 2015-04-30 12:18:16 -04:00
Antonio Murdaca
0ec0dcde9e Remove integration tests and port them to integration-cli 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: f7e417ea5e26f11ec43dba64ee153765d2276f40
Component: engine
 2015-04-30 01:35:16 +02:00
Madhu Venugopal
9d5c96c875 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
 2015-04-29 11:41:13 -07:00
Madhu Venugopal
0976611d84 Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
 2015-04-29 10:16:31 -07:00
Madhu Venugopal
febe54901d Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
 2015-04-29 09:55:49 -07:00
Madhu Venugopal
73bcda784f Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
 2015-04-29 09:55:42 -07:00
Madhu Venugopal
e04b055914 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
 2015-04-29 09:55:34 -07:00
Madhu Venugopal
2a71cc5aaf Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
 2015-04-29 09:55:25 -07:00
Doug Davis
53d8f39607 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 534ed8c2d4573e88fcb68b23341504f8949b34b5
Component: engine
 2015-04-29 06:20:33 -07:00