docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,614 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

853 Commits

Author SHA1 Message Date
jmzwcn 28547a1a3a Remove empty line after client.CmdInspect docstring #12706 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2015-05-03 17:23:18 +08:00
Antonio Murdaca c7cfdb65aa Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-02 03:12:58 +02:00
Alexander Morozov 393678474f Merge pull request #12924 from runcom/provide-struct-to-cli-stream 
Provide a struct to configure cli streaming
 2015-05-01 15:10:58 -07:00
Antonio Murdaca d9639409fd Provide a struct to configure cli streaming 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-01 20:23:44 +02:00
Qiang Huang 79f13d1497 fix docker rm name issue 
Addresses https://github.com/docker/docker/issues/12308

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-01 22:26:40 +08:00
Doug Davis 68ee5bdf96 Don't wrap 'cp' help too soon. 
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.

This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.

The \n made the output look funky.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-30 14:43:14 -07:00
jhowardmsft 86d1223a29 Windows: mkdirall volume path aware 
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
 2015-04-30 11:59:42 -07:00
Antonio Murdaca 531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Doug Davis 534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Brian Goff f2f8e4c5c9 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
 2015-04-29 09:14:03 -04:00
Lei Jitang 0e752adf55 Fix docker rename help not consistent with other commands 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-29 19:37:20 +08:00
Qiang Huang c7812f01c7 fix a minor inspect format issue 
Before, inspect cont1 cont2 shows:
[{
    xxx
}
,{
    xxx
}
]
After, it shows:
[
{
   xxx
}
,{
    xxx
}
]

Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.

To get symmetry, above is our choice.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-28 18:51:04 +08:00
Antonio Murdaca 844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Tibor Vass 572ba9cb40 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
 2015-04-27 14:13:03 -04:00
He Simei 6d9439c627 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-27 12:41:03 +08:00
Julien Barbier bb41193998 Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42 
Signed-off-by: Julien Barbier <write0@gmail.com>
 2015-04-25 15:25:51 -04:00
He Simei daad696e09 Fix error prompt for pull & import handler postImagesCreate. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-25 09:10:32 +08:00
Alexander Morozov 790c63a5ef Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
 2015-04-24 10:16:01 -07:00
David Calavera 1cfb307d70 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:45 -07:00
Lei Jitang 5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Ma Shimiao 66acef865d clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-24 08:38:14 +08:00
Antonio Murdaca fa2c68a89e Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 23:36:29 +02:00
Alexander Morozov 799cf056e7 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
 2015-04-23 13:07:40 -07:00
Jessie Frazelle 1492a7d7fd Merge pull request #12702 from LK4D4/good_ol_flushed 
Return weird behaviour of returning json errors
 2015-04-23 13:03:29 -07:00
Arnaud Porterie c4914f071f Merge pull request #12577 from jfrazelle/actually-depreciate-rm 
actually depreciate -rm insteam of --rm.. and a few others
 2015-04-23 11:55:20 -07:00
Alexander Morozov 9ed5bfb083 Merge pull request #12636 from duglin/MoveConfig 
Move CLI config processing out from under registry dir
 2015-04-23 11:50:31 -07:00
Brian Goff 2c70288ca6 Merge pull request #12703 from LK4D4/carry_12596 
remove job from image_export
 2015-04-23 14:27:59 -04:00
Srini Brahmaroutu 231d362db7 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 18:25:18 +00:00
Jessie Frazelle 2345389975 Merge pull request #12687 from WeiZhang555/NotFound 
refactor httpError() and add 404 "not found" mapping
 2015-04-23 11:21:09 -07:00
Simei He 2a14b7dd35 remove job from image_export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-23 10:54:25 -07:00
Alexander Morozov ec51ba01db 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>
 2015-04-23 10:27:37 -07:00
Doug Davis bb9da6ba92 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>
 2015-04-23 10:18:38 -07:00
Alexander Morozov 2351b87551 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
 2015-04-23 09:57:17 -07:00
Alexander Morozov 71ac5b7903 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
 2015-04-23 09:21:00 -07:00
Simei He d456401fe1 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 21:21:56 +08:00
Zhang Wei ab42a3a23a 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>
 2015-04-23 19:37:47 +08:00
Simei He 70bb0d8ed7 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 19:13:12 +08:00
Qiang Huang a8d2fbe7b4 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>
 2015-04-23 18:41:30 +08:00
Doug Davis eae272f90e Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
 2015-04-22 23:06:13 -04:00
Qiang Huang b0ef3194aa fix inspect format result 
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-23 09:28:07 +08:00
Brian Goff 3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Doug Davis 5ea8dc376c Merge pull request #12649 from jlhawn/fix_pull_err_explosion 
Correctly format API error on image pull
 2015-04-22 20:28:24 -04:00
Antonio Murdaca 4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Jessie Frazelle 3c9ae03a86 Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
 2015-04-22 15:32:14 -07:00
Josh Hawn fd4f7c4e5c Correctly format API error on image pull 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-04-22 14:11:25 -07:00
jianbosun 24425021d2 remove execCreate & execStart from job 
Also removed the function ExecConfigFromJob

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-22 13:51:57 -07:00
Peggy Li 58065d0dd9 Fix golint errors in docker/api/client 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-04-22 00:14:23 -07:00
Alexander Morozov a2f74aa4b4 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 14:55:23 -07:00
Antonio Murdaca 27811355bd Remove writeJSONEnv 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-21 18:14:39 +02:00
Jessie Frazelle 17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle 47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Jessie Frazelle 82f75df9e9 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
 2015-04-20 17:27:17 -07:00
Jessie Frazelle 4bb8924b52 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
 2015-04-20 17:26:09 -07:00
Jessica Frazelle f3d4c33213 actually depreciate -rm, -sig-proxy, -name, seriously its been forever 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-20 17:20:23 -07:00
Jessie Frazelle 4a25c5d25b Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
 2015-04-20 17:02:43 -07:00
David Calavera 3b05005a12 Add flusher check to utils.WriteFlusher. 
That way we can know when the stream has been flushed.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 14:25:45 -07:00
David Calavera ae4063585e Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:06 -07:00
David Calavera 9a2c009751 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:04 -07:00
Alexander Morozov 08ef006d17 Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
 2015-04-20 13:12:17 -07:00
Doug Davis 18c9b6c645 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-20 13:05:24 -07:00
Alexander Morozov da7bca4496 Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 09:45:31 -07:00
Zhang Wei 66239ab5c9 change httpError logic 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
 2015-04-20 23:26:56 +08:00
Lei Jitang dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Alexander Morozov d9ed316522 Make API server datastructure 
Added daemon field to it, will use it later for acces to daemon from
handlers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 08:13:39 -07:00
Alexander Morozov b5584ec24a Merge pull request #12537 from hqhq/hq_remove_unused_function 
remove unused function in server_unit_test.go
 2015-04-20 07:51:53 -07:00
Hu Keping f4942ed864 Remove Job from Info API 
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-20 18:14:06 +08:00
Qiang Huang 641a7ec9ad remove unused function in server_unit_test.go 
After engine refactor, some functions are no longer used.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-20 16:27:47 +08:00
Ankush Agarwal edf541c22b gofmt whole directory 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-20 01:08:51 -07:00
Doug Davis b1d8ae3824 Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
 2015-04-19 16:02:28 -04:00
Simei He 99f6309b97 remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-19 18:36:56 +08:00
Brian Goff 055c6dbaef Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
 2015-04-17 15:26:30 -04:00
Simei He 6e38a53f96 remove job from pull and import 
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-17 09:55:02 -07:00
Antonio Murdaca a0bf80fe03 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-17 14:27:38 +02:00
Hu Keping b052f7a87c Change log severity for non-tlsverify bind 
closes #12459

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-17 21:27:58 +08:00
Antonio Murdaca e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02:00
Arnaud Porterie ae5cf30c7c Add -H|--human flag to `docker history` 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 08:38:18 -07:00
Dave Henderson dcff07d03d Adding a verbose time option to output formatted timestamps 
Fixes #11413

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-16 08:34:50 -07:00
Brian Goff de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
Alexander Morozov 83d809f3d2 Merge pull request #12388 from xiaods/issue-12373 
client.StatusError don't be returned as a pointer
 2015-04-15 17:34:38 -07:00
Deshi Xiao bae3023eef client.StatusError don't be returned as a pointer 
closes #12373

1. remove & from client.StatusError
2. remove * from Error method

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
 2015-04-16 01:27:07 +08:00
David Calavera 767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00
Qiang Huang f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00
David Calavera 98996a432e Remove engine.Job from Create action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00
David Calavera 610c436e07 Remove engine.Job from Start action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00
Phil Estes 5395cdcae5 Merge pull request #12269 from kostickm/12251-remove-not-empty-check 
Remove container name not empty check
 2015-04-14 17:55:13 -04:00
Megan Kostick 98f857772f Remove container name not empty check 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-14 11:27:06 -07:00
Alexander Morozov 5be5749d54 Merge pull request #12370 from buddhamagnet/11593-api-client-docs 
add docs for DockerCli and NewDockerCli fixes #11593
 2015-04-14 11:00:19 -07:00
buddhamagnet 69747b3c1e add docs for DockerCli and NewDockerCli 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
 2015-04-14 18:33:11 +01:00
Brian Goff 392fd243bc Merge pull request #12365 from HuKeping/list 
Use local variable err instead of a outer one
 2015-04-14 12:49:15 -04:00
Hu Keping a0804e8e11 Use local variable err instead of a outer one 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-15 00:29:53 +08:00
Antonio Murdaca c30a55f14d Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-14 01:37:36 +02:00
Michael Crosby 6fa2a1e486 Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
 2015-04-13 13:32:45 -07:00
Michael Crosby 75b911eb3c Merge pull request #12222 from chenhanxiao/cp-support-colon 
cp: add support for copy filename with ":"
 2015-04-13 13:09:12 -07:00
Evan Hazlett 3509132a6e Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
 2015-04-13 14:30:53 -04:00
Michael Crosby 6f928be7ef Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
 2015-04-13 09:59:11 -07:00
Michael Crosby 33e83d0581 Merge pull request #12279 from runcom/remove-job-commit 
Remove job from commit
 2015-04-13 09:57:54 -07:00
Brian Goff 12eff0c26f Merge pull request #12312 from runcom/remove-job-container-stats 
Remove job from container stats
 2015-04-13 11:58:31 -04:00
Brian Goff a4f98d3225 Merge pull request #12313 from runcom/remove-job-export 
Remove job from export
 2015-04-13 11:57:55 -04:00
Alexander Morozov bfb487dc50 Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
 2015-04-13 08:38:46 -07:00
Antonio Murdaca 6b737752e3 Remove job from export 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 15:27:45 +02:00