docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,739 Commits 21 Branches 28 Tags 814 MiB
Commit Graph

326 Commits

Author SHA1 Message Date
David Calavera 4389fc8bf9 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
 2015-05-29 15:05:21 -07:00
Antonio Murdaca ec97f41465 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:36 +02:00
Jessica Frazelle b372f9f224 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 10:00:22 -07:00
Raghuram Devarakonda 7b6f9da52c Make the version mismatch message more explicit. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-28 17:54:48 -04:00
Jessie Frazelle 1f22676fcb Merge pull request #13559 from LK4D4/fix_systemd_listen 
Treat systemd listeners as all other
 2015-05-28 14:15:34 -07:00
Alexander Morozov 6f9fa64645 Treat systemd listeners as all other 
Fix #13549

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-28 12:15:03 -07:00
Brian Goff 45488f9dc0 Merge pull request #13259 from Microsoft/10662-configbridge 
Windows: factor out bridgeConfig from server+config
 2015-05-28 12:59:57 -04:00
Alexander Morozov 7b57fae046 Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
 2015-05-27 10:44:57 -07:00
Qiang Huang 94d604357f Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:25:57 +08:00
Qiang Huang 7c7aebfcfe Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:16:28 +08:00
John Howard ead2f80073 Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-23 19:22:06 -07:00
David Calavera 0bfbc6e788 Extract sockets initialization to a package. 
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-20 16:48:39 -07:00
Alexander Morozov 53a795378d Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan d18919e304 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>
 2015-05-19 22:40:19 +00:00
Doug Davis 7fcf849749 Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-19 11:21:05 -07:00
Alexander Morozov b5e932a3bf Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
 2015-05-16 09:05:03 -07:00
Ahmet Alp Balkan 1630ed97ac Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-15 20:21:59 +00:00
Victor Vieux b261ce5fb0 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-14 17:31:45 -07:00
Brian Goff ac81cd1fc3 Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
 2015-05-14 10:36:50 -04:00
Doug Davis 3f4926e49b Fix a regression in `docker import` on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 06:56:52 -07:00
Hu Keping 945fc9d882 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-14 18:58:55 +08:00
Antonio Murdaca 6b700bdaca Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 00:09:41 +02:00
Antonio Murdaca 7284b08204 Remove API codepaths < 1.12 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-12 20:09:49 +02:00
Alexander Morozov 3b13e56fd7 Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup 
Refactor server to use the daemon as a service
 2015-05-12 10:27:43 -07:00
Antonio Murdaca e2acca67c8 Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-11 19:56:41 +02:00
Ahmet Alp Balkan cb9a6b9aed Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-10 20:42:14 +00:00
Alexander Morozov c5710c7318 Merge pull request #13093 from tianon/writeflusher 
Move WriteFlusher out of utils into ioutils
 2015-05-09 09:39:17 -07:00
Ma Shimiao dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
Tianon Gravi 223d6de728 Move WriteFlusher out of utils into ioutils 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-08 12:33:33 -06:00
David Calavera 404412282d Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt 
Fix error prompt for pull & import handler postImagesCreate.
 2015-05-07 16:27:15 -07:00
Bharath Thiruveedula 94def48878 Removing the SetDaemon method 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
 2015-05-07 22:25:13 +05:30
David Calavera d78755d159 Merge pull request #12822 from brahmaroutu/container_stop_api 
restapi stop fails if ?t=int not present
 2015-05-07 09:38:59 -07:00
Srini Brahmaroutu 68e9c07850 Restapi for stop fails if ?t=int not present 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-05-07 15:43:50 +00:00
Antonio Murdaca 74121a4211 Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-07 01:49:16 +02:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Adria Casas a2c76912e0 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
 2015-05-05 08:54:28 +02:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Brian Goff f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04: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
Antonio Murdaca 531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02: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
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
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
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
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
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
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
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
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
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 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
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 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
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
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
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
Antonio Murdaca e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02: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
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
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
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
Antonio Murdaca 3341f3a355 fix api server resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:42:12 +02:00
Antonio Murdaca 65a056345c Remove jobs from stats 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:33:53 +02:00
Antonio Murdaca 91bfed6049 Remove job from logs 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:25:31 +02:00
Doug Davis a54fd325e6 Merge pull request #12305 from runcom/remove-job-exec-inspect 
Remove job from execInspect
 2015-04-12 08:30:38 -04:00
Antonio Murdaca 04cc6c6aa4 Remove job from stop 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-12 00:41:16 +02:00
Antonio Murdaca 621ee1f6a4 Remove job from execInspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-12 00:15:34 +02:00