toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,055 Commits 3 Branches 295 Tags
250a79f32d820eb8010a77ee58646ea7193be0fc
Commit Graph
15055 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mary Anthony 250a79f32d Removing firewalld info 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b6d8b65e5595304ef9b89f1f2ff2cae46c70dae9
Component: engine
 2015-04-23 14:04:36 -07:00
Tibor Vass 249f3df46c Merge pull request #9397 from jpopelka/9395-firewalld 
Firewalld support
Upstream-commit: 259effc6dfd901130ca6d2926090bddfe35f7cdc
Component: engine
 2015-04-23 16:58:08 -04:00
Jessie Frazelle aa65355e58 Merge pull request #12417 from hashneo/patch-1 
What if authConfig or factory is Nill?
Upstream-commit: 6b8d8a5847cc92ef8d96067da6b104b6e66ceaaf
Component: engine
 2015-04-23 13:54:47 -07:00
Jessie Frazelle 0b2612ded7 Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport 
Fix TestEventsImageImport racy
Upstream-commit: b31d154294ed7a621de1b620f051cf9547c09385
Component: engine
 2015-04-23 13:28:43 -07:00
Jessie Frazelle c2fd04b393 Merge pull request #12575 from brahmaroutu/integration_test7_12255 
Move https tests as unit tests under client
Upstream-commit: 59ae92d55c4b074db31698c1bc05e2114dc3106c
Component: engine
 2015-04-23 13:17:54 -07:00
Jessie Frazelle 88eea81abe Merge pull request #12655 from jlhawn/fix_12281 
Validate repo name before image pull
Upstream-commit: 68fc79f5924bc76111422eec5b7713a586febd96
Component: engine
 2015-04-23 13:12:12 -07:00
Alexander Morozov 1c64e12359 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
 2015-04-23 13:07:40 -07:00
Jessie Frazelle f84b67fdd0 Merge pull request #12674 from TomasTomecek/fix-v1-spec-typos 
v1 spec: fix typos and formatting
Upstream-commit: 052cba7278a525078dff92ac0e2fed137ee5e9eb
Component: engine
 2015-04-23 13:07:21 -07:00
Jessie Frazelle 0426fea7df Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race 
Fix TestRenameStoppedContainer race
Upstream-commit: 036ade6c0548d85941e8c26306ac7c27105448ea
Component: engine
 2015-04-23 13:04:36 -07:00
Jessie Frazelle 683e3fbf65 Merge pull request #12702 from LK4D4/good_ol_flushed 
Return weird behaviour of returning json errors
Upstream-commit: 1492a7d7fd91e52a52937cafe1137330a89a910e
Component: engine
 2015-04-23 13:03:29 -07:00
Arnaud Porterie 079bd06b02 Merge pull request #12577 from jfrazelle/actually-depreciate-rm 
actually depreciate -rm insteam of --rm.. and a few others
Upstream-commit: c4914f071ffad203bc4ed16404f7ddc985a5f63e
Component: engine
 2015-04-23 11:55:20 -07:00
Alexander Morozov fdbedc1a2a Merge pull request #12636 from duglin/MoveConfig 
Move CLI config processing out from under registry dir
Upstream-commit: 9ed5bfb083a8e848b43f5220ca89c82ea416a93b
Component: engine
 2015-04-23 11:50:31 -07:00
Josh Hawn 8cb2465efc Validate repo name before image pull 
Checks for reserved 'scratch' image name.

fixes #12281

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 18f46883851e47387ec2bd116940cdae97ba3c8d
Component: engine
 2015-04-23 11:44:46 -07:00
Jessie Frazelle 38989f71ca Merge pull request #12690 from rajdeepd/dry-run-test 
Container API Test with HostName
Upstream-commit: 03e77e5c8fe90ee7620f2198d140eca7bed23ab8
Component: engine
 2015-04-23 11:32:47 -07:00
Jessie Frazelle 68210d0ad0 Merge pull request #12692 from cpuguy83/fix_commit_test 
Fix race with TestContainerApiCommit
Upstream-commit: 59acccb6f2dae4659797636196dfde7263789923
Component: engine
 2015-04-23 11:31:27 -07:00
Brian Goff 7362927093 Merge pull request #12703 from LK4D4/carry_12596 
remove job from image_export
Upstream-commit: 2c70288ca60cde8844220c90306da8bf7728026f
Component: engine
 2015-04-23 14:27:59 -04:00
Srini Brahmaroutu 12be8c3158 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 231d362db73310a5243a72dcdb6df2df57c74488
Component: engine
 2015-04-23 18:25:18 +00:00
Alexander Morozov 2b16b6e81b Merge pull request #12646 from duglin/validateTests 
Validate we're not using the old testing stuff
Upstream-commit: d17f2baa811e06dcf70b989c1a84de66da327f12
Component: engine
 2015-04-23 11:23:20 -07:00
Jessie Frazelle 19c7093025 Merge pull request #12687 from WeiZhang555/NotFound 
refactor httpError() and add 404 "not found" mapping
Upstream-commit: 2345389975258c0a586ff39de070749151733625
Component: engine
 2015-04-23 11:21:09 -07:00
Alexander Morozov bf5999d8af Merge pull request #12500 from tianon/fix-daemon-logic 
Fix daemon start/stop logic in hack/make/* scripts
Upstream-commit: dcbf89d023c6578a50b13d9bad0f8f64722d6256
Component: engine
 2015-04-23 11:20:33 -07:00
Simei He bda3c79940 remove job from image_export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2a14b7dd35901167d83735a25ff626596391c4ed
Component: engine
 2015-04-23 10:54:25 -07:00
Tianon Gravi d67e51c7b3 Fix daemon start/stop logic in hack/make/* scripts 
From the Bash manual's `set -e` description:
(https://www.gnu.org/software/bash/manual/bashref.html#index-set)

> Exit immediately if a pipeline (see Pipelines), which may consist of a
> single simple command (see Simple Commands), a list (see Lists), or a
> compound command (see Compound Commands) returns a non-zero status.
> The shell does not exit if the command that fails is part of the
> command list immediately following a while or until keyword, part of
> the test in an if statement, part of any command executed in a && or
> || list except the command following the final && or ||, any command
> in a pipeline but the last, or if the command’s return status is being
> inverted with !. If a compound command other than a subshell returns a
> non-zero status because a command failed while -e was being ignored,
> the shell does not exit.

Additionally, further down:

> If a compound command or shell function executes in a context where -e
> is being ignored, none of the commands executed within the compound
> command or function body will be affected by the -e setting, even if
> -e is set and a command returns a failure status. If a compound
> command or shell function sets -e while executing in a context where
> -e is ignored, that setting will not have any effect until the
> compound command or the command containing the function call
> completes.

Thus, the only way to have our `.integration-daemon-stop` script
actually run appropriately to clean up our daemon on test/script failure
is to use `trap ... EXIT`, which we traditionally avoid because it does
not have any stacking capabilities, but in this case is a reasonable
compromise because it's going to be the only script using it (for now,
at least; we can evaluate more complex solutions in the future if they
actually become necessary).

The alternatives were much less reasonable.  One is to have the entire
complex chains in any script wanting to use `.integration-daemon-start`
/ `.integration-daemon-stop` be chained together with `&&` in an `if`
block, which is untenable.  The other I could think of was taking the
body of these scripts out into separate scripts, essentially meaning
we'd need two files for each of these, which further complicates the
maintenance.

Add to that the fact that our `trap ... EXIT` is scoped to the enclosing
subshell (`( ... )`) and we're in even more reasonable territory with
this pattern.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 929af4c38d8ca4754d2a3ccf087d359bb67c33f3
Component: engine
 2015-04-23 11:31:16 -06:00
Doug Davis 2c94df895a Validate we're not using the old testing stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ecccfa82aa22829c52778c4457cacd8d766e3dda
Component: engine
 2015-04-23 10:29:47 -07:00
Alexander Morozov 0c04318339 Return weird behaviour of returning json errors 
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ec51ba01dbbeadb06cc7f3c14e94f8a2ee938a34
Component: engine
 2015-04-23 10:27:37 -07:00
Doug Davis c8f1332dce Move CLI config processing out from under registry dir 
No logic changes should be in here, just moving things around.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
 2015-04-23 10:18:38 -07:00
Alexander Morozov f1a7f3bc6a Merge pull request #12691 from runcom/remove-deleteAllContainers-call 
Remove deleteAllContainers call in test
Upstream-commit: fa3e2dd45e006953b500a01f29b94f9a1f893298
Component: engine
 2015-04-23 10:01:08 -07:00
Alexander Morozov 898f52e474 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
Upstream-commit: 2351b87551a0ee3ec97afc34b7cace7f716190d2
Component: engine
 2015-04-23 09:57:17 -07:00
Alexander Morozov ad85dea266 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
Upstream-commit: 71ac5b79038964c353645c78e354654cb5730434
Component: engine
 2015-04-23 09:21:00 -07:00
Srini Brahmaroutu ab3ddde4ab Move https integration tests as unit tests under client 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 05013f1250dc141ed43f987dd8b6a650d0e47ac9
Component: engine
 2015-04-23 15:40:46 +00:00
Brian Goff 89c29c074a Merge pull request #12683 from tristan0x/patch-1 
Fix typo in builder reference
Upstream-commit: 455d83939a772699e388ca149f240a236a01f23b
Component: engine
 2015-04-23 11:12:49 -04:00
Antonio Murdaca dd4b0467ca Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ee7a7b07e752c56bbe1b941feb1e4313275d68c2
Component: engine
 2015-04-23 16:32:50 +02:00
Antonio Murdaca f701770bee Fix TestRenameStoppedContainer race 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: cd6cc45d52a135e9e123c2e8c647710a061d38a0
Component: engine
 2015-04-23 16:11:46 +02:00
Rajdeep Dua 407d8746a2 TestCase added for Container Create with HostName 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: fca4aea077f1960a0cdd0056477730b3f8e0ca38
Component: engine
 2015-04-23 06:53:34 -07:00
Brian Goff a10a6cc648 Fix race with TestContainerApiCommit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 563708d78d42afe89374d5819fdb671ed72c2dad
Component: engine
 2015-04-23 09:45:06 -04:00
Simei He 6b55be9005 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: d456401fe1d038ddaf9866bb6ab4ac5744186e2d
Component: engine
 2015-04-23 21:21:56 +08:00
Doug Davis 32da7ca556 Merge pull request #12579 from ZJU-SEL/remove_job_from_load 
remove job from load
Upstream-commit: 1b4de6f2e8d7bfafbf8df5e13ad24e409c21edb0
Component: engine
 2015-04-23 08:20:37 -04:00
Doug Davis f26d981f04 Merge pull request #12663 from Mashimiao/Move-setHostConfig-to-daemon-file 
Move setHostConfig to daemon file
Upstream-commit: d59ce5cd48ddb7eec7bbf768e50dd730003dad4d
Component: engine
 2015-04-23 07:43:42 -04:00
Doug Davis b609417259 Merge pull request #12680 from Mashimiao/fix-typo-push-test 
push test: fix typo
Upstream-commit: f4cfaac5190bd52dc63948e781065d0519b0f686
Component: engine
 2015-04-23 07:37:50 -04:00
Zhang Wei 84dc009f41 refactor httpError() and add 404 "not found" mapping 
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ab42a3a23a1276ccad874a13cf8604cb59124e10
Component: engine
 2015-04-23 19:37:47 +08:00
Simei He ece94d0722 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
 2015-04-23 19:13:12 +08:00
Qiang Huang f4814df32c fix test case name 
Name like this will never run by go test. And this test case won't
get PAAS.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a8d2fbe7b4593f1e10800a19df14e1bbfb212d41
Component: engine
 2015-04-23 18:41:30 +08:00
Tristan Carel 63429192b7 Fix typo in builder reference 
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
Upstream-commit: 47263c6514457d58c1062671077118063189d433
Component: engine
 2015-04-23 12:10:47 +02:00
Ma Shimiao 0b4dffa97c push test: fix typo 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 62f91b1d34155a58bfeb6ce8d3595149cf5147d7
Component: engine
 2015-04-23 16:50:41 +08:00
Tomas Tomecek 7a651c5c69 v1 spec: fix typos and formatting 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Upstream-commit: d6c839cf0f04f30ba95e2b032a4e686dea2eb0d0
Component: engine
 2015-04-23 08:19:52 +02:00
Sven Dowideit 4ea8bd7fe7 Merge pull request #12599 from RickWieman/10673-make-headings-consistent 
Makes headings in documentation consistent
Upstream-commit: fdc5aa2043f947d0050e559d2c698481bec79e09
Component: engine
 2015-04-23 16:15:10 +10:00
Rick Wieman 701a9fb9a1 Makes headings in documentation consistent 
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
 2015-04-23 07:41:30 +02:00
Doug Davis 0b0a96ad89 Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
Upstream-commit: eae272f90eb6c01824112054140b5dc7d9d679ce
Component: engine
 2015-04-22 23:06:13 -04:00
Ma Shimiao 75c324a9e3 Move setHostConfig to daemon file 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dde0cc78bdec31be1ecbd7def6a83111224ccc55
Component: engine
 2015-04-23 10:23:02 +08:00
Brian Goff eaff99d710 Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test 
Add integration test for history option
Upstream-commit: 6bacb4528eca2d491d261bd6fb5b76022bf0d058
Component: engine
 2015-04-22 22:09:01 -04:00
Brian Goff f01047d748 Merge pull request #12543 from vdemeester/11584-pkg-stdcopy-test-coverage 
Add some stdcopy_test (coverage)
Upstream-commit: 60ad23a7b3ea6a06cd8ded165ebaab5fd0cc3bd9
Component: engine
 2015-04-22 22:03:15 -04:00