toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,046 Commits 3 Branches 295 Tags
df52d83f511e9f07650a729401906fbf2b2a2502
Commit Graph
757 Commits
Author SHA1 Message Date
Jessie Frazelle df52d83f51 Merge pull request #10622 from estesp/10618-err-ondup-bind-vols 
Don't allow duplicate `-v` specifications for the same target
Upstream-commit: 271a073a04cdffbeda5f83d2d227c5e8c5f8ae86
Component: engine
 2015-02-06 15:03:56 -08:00
Michael Crosby acc900171e Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options 
Specifying -a and -d to docker run should throw an error
Upstream-commit: eb79acd7a0db494d9c6d1b1e970bdabf7c44ae4e
Component: engine
 2015-02-06 14:58:08 -08:00
Michael Crosby 2793f9f606 Merge pull request #10105 from LK4D4/remove_tons_of_names 
Use graphdb.Walk with depth=1 in /containers
Upstream-commit: 9d140fe693a221cd19857c1232da66c52df51c9b
Component: engine
 2015-02-06 14:33:26 -08:00
Alexander Morozov 01d71dc709 Merge pull request #10153 from acbodine/api_websocket_test 
Adds test for api attach via websocket
Upstream-commit: b6dc430d995acd34958c2b1b7becd2e0f473c5a7
Component: engine
 2015-02-06 14:29:54 -08:00
Alexander Morozov 13f02d612c Test for links names in ps --no-trunc 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2a3225eb82274d245c25fc6191945dde1f25f668
Component: engine
 2015-02-06 14:05:08 -08:00
Phil Estes b33f390dce Don't allow duplicate -v specifications for the same target 
Addresses: #10618

Given that the user has no notification that they tried to bind mount
different directories on the same target in the container, this errors
out in that case, without changing the current code allowing for
--volumes-from to trump -v/VOLUME specifications.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d1f33d12d4126aae80c51ab1075a5b8323a5f957
Component: engine
 2015-02-06 17:00:53 -05:00
Tibor Vass 29804755f7 Merge pull request #10601 from LK4D4/fix_tag_name_in_ps 
Show right tag for container in ps
Upstream-commit: a982432c16ffb3c823530e00b84b7c7676802f24
Component: engine
 2015-02-06 16:59:49 -05:00
Tibor Vass eba231efa0 Merge pull request #10120 from duglin/TrimSpaces 
Remove leading/trailing spaces in builder/parser
Upstream-commit: 82191cc3f3b3ea49da6287abdb9c2ba6eb6d253c
Component: engine
 2015-02-06 16:25:37 -05:00
Doug Davis a8f9224e85 Make checking of help text smarter 
As I was reworking https://github.com/docker/docker/pull/9402 I realized
that the new testcase I just added that verified all help text is within
80 characters really should be smarter and ask "docker help" for the list
of commands to check instead of having a hard-coded list.  This way
it will catch "docker execwait" automagically once #9402 is merged.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 969ba5c7edfdca1d97a836e9549d80ce547a86a0
Component: engine
 2015-02-06 13:02:58 -08:00
Alexander Morozov 915f96f67c Show right tag for container in ps 
Fixes #10599

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e45deceb462351f841aa077819fdef3166381c50
Component: engine
 2015-02-06 11:32:01 -08:00
Doug Davis 7b03f17d1a Remove leading/trailing spaces in builder/parser 
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.

Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3859c485317a395de1e8eb48270d0e3b1207a204
Component: engine
 2015-02-06 08:52:18 -08:00
Doug Davis 013dbb146f Pretty the help text 
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2203b37733e76d653cfe3b0ec5870786076adce7
Component: engine
 2015-02-04 07:59:16 -08:00
Tibor Vass 3ba1373e01 builder: prevent Dockerfile to leave build context 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 73d5baf585e3ef55864abeef43d45fe0b3a1c2bc
Component: engine
 2015-02-02 23:40:24 -08:00
Doug Davis 56a2a654e8 Add an API test for docker build -f Dockerfile 
I noticed that while we have tests to make sure that people don't
specify a Dockerfile (via -f) that's outside of the build context
when using the docker cli, we don't check on the server side to make
sure that API users have the same check done. This would be a security
risk.

While in there I had to add a new util func for the tests to allow us to
send content to the server that isn't json encoded - in this case a tarball

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 198ff76de59a600ce900497fd4a6131ee4448c48
Component: engine
 2015-02-02 23:40:20 -08:00
Alexander Morozov 3ae87a3a28 Fix some go vet errors 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4ee05a4d3e6f9ad955d96075a1e63d59ed73ac78
Component: engine
 2015-02-02 14:53:20 -08:00
Michael Crosby c8bbb49221 Merge pull request #10455 from ashahab-altiscale/9875-lxc-symlink 
Fixes symlink, container size, and kmsg tests
Upstream-commit: 382f187b1a4d038b45d0e7965a0af8e158a2e9da
Component: engine
 2015-02-02 13:13:27 -08:00
André Martins ebc844c8a7 Fixes #10388 
The cmd.Lookup should be "-attach" and not "attach", as seen in
docker/docker/runconfig/parse.go

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: af90fe6a633be3a5bff4d20b0a59b9189a171176
Component: engine
 2015-02-02 12:07:52 +00:00
Arnaud Porterie 0820460272 Fix race in test registry setup 
Wait for the local registry-v2 test instance to become available to
avoid random tests failures.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: de8ea06d7dab7c5278f84728f7e0aa69e3301ad0
Component: engine
 2015-01-31 11:31:41 -08:00
Derek McGowan 12b02aa7f6 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 403d981d70dc8a493a9a10be4b5d2e2ce871f380
Component: engine
 2015-01-30 14:20:32 -08:00
Abin Shahab 764888405b Fixes symlink, container size, and kmsg tests 
Changes symlink, container size and kmsg tests to account for lxc driver.
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: 29ac29a4361e0392979ad6a99341bff174f76967
Component: engine
 2015-01-30 09:30:42 +00:00
Jessie Frazelle 78452ce653 Merge pull request #10446 from dmcgowan/defer-key-file-creation 
Defer creation of trust key file until needed
Upstream-commit: d748ec31d5f89f4cbe363ac9b38310906bf2a9e0
Component: engine
 2015-01-29 15:23:35 -08:00
Derek McGowan eb1117987a Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0eed1f4d8da893d7c91be811197032a064053155
Component: engine
 2015-01-29 13:46:12 -08:00
Tibor Vass 09a29b4b64 Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
Upstream-commit: fb9363eb2a859684aefc46d5854f05ed02e74bcf
Component: engine
 2015-01-28 21:21:05 -05:00
Tibor Vass c60988becd Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
Upstream-commit: 70fbd45a5c88f6f39a07b04f81a07721bf5f3eed
Component: engine
 2015-01-28 14:43:16 -05:00
Jessica Frazelle e7f0104567 Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6a2c6e971d8b760931402e15513e91c71cba4b72
Component: engine
 2015-01-26 17:17:08 -08:00
Brian Goff c124b59c51 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b54305ae2330bcadd2ef657a17f4a87896031d1f
Component: engine
 2015-01-26 15:22:32 -05:00
Arnaud Porterie 68915fde41 Merge pull request #10335 from euank/EmptyLayerConfig 
Allow empty layer configs in manifests
Upstream-commit: 74014e4a92fc600259605e4201ea6a70b4e623d3
Component: engine
 2015-01-26 11:53:36 -08:00
Michael Crosby 00cef48e11 Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code 
Adds ipc namespace capability to lxc, and fixes tests.
Upstream-commit: 364c64cf1aa912ea8197caa6b23b96e20ead64fb
Component: engine
 2015-01-26 11:21:48 -08:00
Euan 3bf93236d1 Allow empty layer configs in manifests 
Before the V2 registry changes, images with no config could be pushed.
This change fixes a regression that made those images not able to be
pushed to a registry.

Signed-off-by: Euan Kemp <euank@euank.com>
Upstream-commit: d477d42dd3e6a98f82c6ed2abb1dfeeb2782539f
Component: engine
 2015-01-24 14:27:37 -08:00
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 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
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
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
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
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
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
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
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
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
Michael Crosby 9381b90c95 Improve robustness of /stats api test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4d7707e183e8dcb8e0ab1415e401cb530df17c92
Component: engine
 2015-01-21 16:00:15 -08:00
Jessie Frazelle 05dc63ed6e Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
Upstream-commit: f1bc0376b822128888a825c5607cee1d861e1c0b
Component: engine
 2015-01-21 15:08:45 -08:00
Alexander Morozov 0bd257dcc5 Test for updating linked hosts on restart 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 606c71d424cb21c8256968eb5d965a0855d1af2d
Component: engine
 2015-01-21 14:34:40 -08:00
Michael Crosby 32b5682b75 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
 2015-01-21 14:16:51 -08:00
Alexander Morozov fdaa4278ca Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach 
Fix racey TestAttachAfterDetach
Upstream-commit: f72bcd336241ea5edbf25df6e3476d6afbd1b01d
Component: engine
 2015-01-21 09:20:24 -08:00
Brian Goff d8af8d0b9f Fix racey TestAttachAfterDetach 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ef8057700b63e2c5fd5cec206915ef1f2088578
Component: engine
 2015-01-21 10:08:37 -05:00
Abin Shahab 3d77110890 Adds ipc namespace capability to lxc, and fixes tests. 
This fixes various tests by checking for non zero exit code, accounting for lxc-specific base-diffs, and by removing lxc specific environment vars.
It also adds the --share-ipc option to lxc-start for shared ipc namespaces.
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: 3ca5af6b1ab6d1b75e014265e1ad4f5e45960826
Component: engine
 2015-01-21 06:08:00 +00:00