starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-09 10:05:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,804 Commits 13 Branches 322 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
21804 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessica Frazelle 36ea1c732a Move links exec test & exec dir test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 43d1c2010125e3c1ef1013ee2e8b4d9371d70d77
Component: engine
 2015-01-23 16:20:46 -08:00
Jessica Frazelle 83a3f5c28f Update project/make.sh to use execdriver buildtag if passed. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 547c95957679672c3ed2e97c7a2950d3c0a03321
Component: engine
 2015-01-23 16:18:39 -08:00
Jessica Frazelle 34351a6734 Add build flag to exec test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ecdbc1a0aff40fa28389d1971528641e2824e5a9
Component: engine
 2015-01-23 16:18:39 -08:00
Jessica Frazelle 3e848a2a63 Move InspectExecID test to exec. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 957cbdbf302750f3fb3467237bebf29d87234208
Component: engine
 2015-01-23 16:18:39 -08:00
Alexander Morozov 9fa17b5deb Merge pull request #10321 from titanous/fix-err 
Fix missing err assignment in bridge creation
Upstream-commit: 30293e3fd0b03aa6bcd7b725fc2429e4cbeeb169
Component: engine
 2015-01-23 15:07:23 -08:00
Jonathan Rudenberg cc1de71aa0 Fix missing err assignment in bridge creation 
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Upstream-commit: d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d
Component: engine
 2015-01-23 14:48:28 -08:00
Derek McGowan 3acf78c713 Use filepath instead of path 
Currently loading the trust key uses path instead of filepath. This creates problems on some operating systems such as Windows.

Fixes #10319

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2cd5b7dae80c5451b729a0be2ade03cbdf2c5c26
Component: engine
 2015-01-23 14:44:30 -08:00
Jessica Frazelle 56fd7d2515 Blacklist zfs with overlay 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ec953b0e7ba89ff3b13b3187d9cee0b8c232b4ff
Component: engine
 2015-01-23 14:00:15 -08:00
Michael Crosby c2c9f5b572 Merge pull request #10311 from jfrazelle/quiet-logs-registry 
Make debugs logs less verbose for registry
Upstream-commit: 62c50abf1382fb3a4cfb72131d0f1573a25ad000
Component: engine
 2015-01-23 13:56:31 -08:00
Jessica Frazelle 1c5b6614c3 Make debugs logs suck less. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c49cd3d2a51ad6d2304c24f7b609cde804a0d6c5
Component: engine
 2015-01-23 13:20:29 -08:00
Josh Hawn cc58d5c62d Always store images with tarsum.v1 checksum added 
Updates `image.StoreImage()` to always ensure that images
that are installed in Docker have a tarsum.v1 checksum.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: ba3bad66f92da057dba2a43ff9a512cf7ad72375
Component: engine
 2015-01-23 11:30:27 -08:00
Tony Miller 513e38914d document the ExtraHosts parameter for /containers/create for the remote API 
I think this was added from version 1.15.

Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
Upstream-commit: 54c10fe81d1894f9683293601a53a0d87a0d7fbd
Component: engine
 2015-01-23 23:52:04 +09:00
Alexander Morozov 566a151923 Merge pull request #10183 from miminar/safe-stop-kill 
Stop and Kill commands made robust
Upstream-commit: 99bffdf10ef31d80ae5d5bcb6dff64d49d4ae03e
Component: engine
 2015-01-23 06:32:51 -08:00
Michal Minar 28feccbe1b Stop and Kill commands made robust 
If stop/kill command hits a short window between process' exit and
container's cleanup, it will no longer fail with 'no such process'
error.

Resolves #10182

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 310337dc89a78cbe245977236f02dcda73728df8
Component: engine
 2015-01-23 10:26:13 +01:00
Qiang Huang 8b134ecd31 add args support for check-config.sh 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aac6090f2df3cc9192d1813e3c1f48b882f063d4
Component: engine
 2015-01-23 16:36:55 +08:00
James Turnbull dfa9fbab62 Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md 
Update using_supervisord.md
Upstream-commit: d3a6a53fa5d399ed0d728e48eed8ea38bca9dc2c
Component: engine
 2015-01-23 00:09:25 -05:00
Sven Dowideit a15322433b Merge pull request #9952 from flowlo/doc-https 
doc: Improve article on HTTPS
Upstream-commit: 992beb2a962a38e7958c14f6188098fe1814c9aa
Component: engine
 2015-01-23 12:34:57 +10:00
Sven Dowideit a76944151d comment out the docker and curl lines we'll run later 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eaf1b88212bb10019cf1d7b1555a305c12001f06
Component: engine
 2015-01-23 12:31:39 +10:00
Sven Dowideit bf1ffd6668 Merge pull request #10260 from acbodine/docs_api_attach_websocket 
Adds docs for /containers/(id)/attach/ws api endpoint
Upstream-commit: fa79e18c20b5ce1c7a6c2c70e5e120d73a59e165
Component: engine
 2015-01-23 10:51:11 +10:00
GennadySpbandSven Dowideit 422d703cc0 Update using_supervisord.md 
Fix factual error

change made by: GennadySpb <lipenkov@gmail.com>

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 99dc224d850a8838f42b9f41229b484197f75fa5
Component: engine
 2015-01-23 10:43:57 +10:00
Jessie Frazelle da0e87ebb9 Merge pull request #10288 from tiborvass/fix-test-attach 
integration-cli: wait for container before sending ^D
Upstream-commit: 54ddb9b41d550fea021efb9f77b7993acf3d6f75
Component: engine
 2015-01-22 15:07:46 -08:00
Tianon Gravi 44958a29f2 Remove windows from the list of supported platforms 
Since it can still be tested natively without this, this won't cause any harm while we fix the tests to actually work on Windows.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 47769994e5cba81a96529b418052afce7a6d51a3
Component: engine
 2015-01-22 15:42:17 -07:00
Tibor Vass 551d8c12b8 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a124bfaef37a9d209de881325dbe653d9b07ef4d
Component: engine
 2015-01-22 17:28:35 -05:00
Arnaud Porterie a5a927b102 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
Upstream-commit: 5a6f84ce089f7a562010564ad7e2ebcb60a39d5d
Component: engine
 2015-01-22 13:17:23 -08:00
Lorenz Leutgeb 3685fbd1c9 Fix inconsistent formatting 
Colon was bold, but regular at other occurences.

Blame cf27b310c4fc8d2c13ba181398a628d03e1e3c58

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: a51554988e615b317e95125f5612a28c3bff8e8a
Component: engine
 2015-01-22 21:46:01 +01:00
Lorenz Leutgeb f5baf563e6 doc: Minor semantical/editorial fixes in HTTPS article 
"read-only" vs. "only readable by you"

Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 048b20e58a1b9d516dd6fb34676d765ebd5a8959
Component: engine
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb 1894376959 doc: Editorial changes as suggested by @fredlf 
Refer to:
 * https://github.com/docker/docker/pull/9952#discussion_r22686652
 * https://github.com/docker/docker/pull/9952#discussion_r22686804

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 6ca2875e580e16a309eb9c9486bb358bde3622ff
Component: engine
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb a50020fe51 doc: Improve article on HTTPS 
* Adjust header to match _page_title
 * Add instructions on deletion of CSRs and setting permissions
 * Simplify some path expressions and commands
 * Consqeuently use ~ instead of ${HOME}
 * Precise formulation ('key' vs. 'public key')
 * Fix wrong indentation of output of `openssl req`
 * Use dash ('--') instead of minus ('-')

Remark on permissions:

It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 02a793c6a133f46129d0fc83ce218d3a92f1e644
Component: engine
 2015-01-22 21:37:39 +01:00
Arnaud Porterie 7a156f1702 Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
Upstream-commit: 10ab6dcb4f8f63ffab44023d286403c494fa24b8
Component: engine
 2015-01-22 11:54:03 -08:00
Derek McGowan 64ed8c80ae Fix nits and defers 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d55e977cf5963f8ae5efdfbee458727f704be398
Component: engine
 2015-01-22 11:22:31 -08:00
Jessie Frazelle e1654ed3ab Merge pull request #10259 from jfrazelle/wording-of-image-verification 
Change the wording of image verification warning.
Upstream-commit: 211513156dc1ace48e630b4bf4ea0fcfdc8d9abf
Component: engine
 2015-01-22 11:14:28 -08:00
Tibor Vass 4cb12b37f1 integration-cli: Fix race in restart loop 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
 2015-01-22 14:06:24 -05:00
Derek McGowan 54a3834558 Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 42612ff6dba2d885a0c55af80128201a4d5166cb
Component: engine
 2015-01-22 10:51:04 -08:00
Derek McGowan d625ce9494 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab
Component: engine
 2015-01-22 10:29:15 -08:00
Jessie Frazelle e6b4861d6f Merge pull request #10266 from bobrik/no-extra-assertion 
Not doing extra assertion for io.Closer
Upstream-commit: c77c67cf87f77ad4da46ade515a4c912a3c612d9
Component: engine
 2015-01-22 10:25:23 -08:00
Arnaud Porterie 4f2ab4bd87 Merge pull request #10244 from dmcgowan/registry-panic-fix 
Fix write after close on http response
Upstream-commit: ef33efc9b9879a8397288b1bd54d8f3fd2460e56
Component: engine
 2015-01-22 10:23:11 -08:00
Alexander Morozov d18e557951 Merge pull request #10250 from crosbymichael/stats-test 
Improve robustness of /stats api test
Upstream-commit: 4aa60a902a03294d8009747f3fc1ba26bb2fd27e
Component: engine
 2015-01-22 09:09:03 -08:00
Ian Babrou ce792ad046 Not doing extra assertion for io.Closer 
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: 4d10b32380793ce5e324a429ce2db60125aae205
Component: engine
 2015-01-22 10:36:20 +03:00
Abin Shahab ac1fc1f916 Fixes apparmor regression 
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 9c744cb454f7d912ae1dd6215caf550a25929944
Component: engine
 2015-01-22 07:06:46 +00:00
Andrew C. Bodine 5c5aa72c84 Adds docs for /containers/(id)/attach/ws api endpoint 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: 51060ee07aaf3ff10ac7187558bd665f4ddd3507
Component: engine
 2015-01-21 18:37:08 -08:00
Andrew C. Bodine 24e8380b6a Adds test for api attach via websocket 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: 9e37a04665395cb98687cd09b05ba33736984547
Component: engine
 2015-01-21 18:35:51 -08:00
Jessica Frazelle 72b2fe27b4 Change the wording of image verification warning. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c97d8b1233bc17a9e58ce97473329ab5de59969a
Component: engine
 2015-01-21 18:07:10 -08:00
Michael Crosby 16972af772 Merge pull request #10257 from vieux/lol 
bump API version
Upstream-commit: 3c77e7d63446f0e0b133010fb3731af5556628bb
Component: engine
 2015-01-21 17:51:27 -08:00
Victor Vieux fd76e3bccd bump API version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9c7689a10e60cd921e1521c729c07184b7c1076c
Component: engine
 2015-01-22 01:15:34 +00:00
Andrew C. Bodine 685b876322 Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: d25a65375c880017ac0c516389b0b7afde810517
Component: engine
 2015-01-21 17:11:31 -08:00
Jessie Frazelle 331f9fe663 Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces 
daemon mount namespaces
Upstream-commit: fcc4abc870e7f62590e418f10ff6f743a47fad12
Component: engine
 2015-01-21 16:55:15 -08:00
Derek McGowan 0d4aa9a72d Add key migration to daemon 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 007ef161b45dd91afcfb7ef9cd32e6c88dbf196e
Component: engine
 2015-01-21 16:55:05 -08:00
Derek McGowan c5219e9048 Fix daemon key file location 
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5
Component: engine
 2015-01-21 16:28:19 -08:00
Arnaud Porterie ee34de2e39 Merge pull request #10235 from jfrazelle/tech-preview-warning 
Warn about tech preview of image verification.
Upstream-commit: e13559a6d69b8c192ba2e0605f956ae84d1eb0db
Component: engine
 2015-01-21 16:24:00 -08:00
Jessica Frazelle f6fc27f6b6 Add test for pull verified 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 614e09a8c7990e05509edb4c335c4b59001cea61
Component: engine
 2015-01-21 16:25:01 -08:00