p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,920 Commits 2 Branches 295 Tags
c5eb072fd3900ea37df30cfde4e518e6d5909d23
Commit Graph

277 Commits

Author SHA1 Message Date
Phil Estes
c1e042a6e9 Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental 
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
 2015-06-01 12:29:45 -04:00
David Calavera
4f53f1bb13 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
 2015-05-29 15:05:21 -07:00
Antonio Murdaca
2b62e414ad Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
 2015-05-29 22:38:36 +02:00
Jessica Frazelle
a4e456d439 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
 2015-05-29 10:00:22 -07:00
Raghuram Devarakonda
9a122de919 Make the version mismatch message more explicit. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
 2015-05-28 17:54:48 -04:00
Jessie Frazelle
5c975d5605 Merge pull request #13559 from LK4D4/fix_systemd_listen 
Treat systemd listeners as all other
Upstream-commit: 1f22676fcb2c6f2bd1a1cbf6123587c4d4e917d0
Component: engine
 2015-05-28 14:15:34 -07:00
Alexander Morozov
147b33c180 Treat systemd listeners as all other 
Fix #13549

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

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
 2015-05-27 18:25:57 +08:00
Qiang Huang
d3998344e0 Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
 2015-05-27 18:16:28 +08:00
John Howard
08d07187fd Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ead2f80073623cb53ade435811b155fe69f2774e
Component: engine
 2015-05-23 19:22:06 -07:00
David Calavera
7811ce8b6f 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>
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
 2015-05-20 16:48:39 -07:00
Alexander Morozov
baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
13426de5e6 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>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Doug Davis
bca5faa4ca Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
 2015-05-19 11:21:05 -07:00
Alexander Morozov
c8d066f882 Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
 2015-05-16 09:05:03 -07:00
Ahmet Alp Balkan
540e90ab62 Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
 2015-05-15 20:21:59 +00:00
Victor Vieux
56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07:00
Brian Goff
59274bcf1f Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
 2015-05-14 10:36:50 -04:00
Doug Davis
703705b500 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>
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
 2015-05-14 06:56:52 -07:00
Hu Keping
2e9a18b752 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>
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
 2015-05-14 18:58:55 +08:00
Antonio Murdaca
aeecef0f70 Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
 2015-05-13 00:09:41 +02:00
Antonio Murdaca
4a0ddadbc0 Remove API codepaths < 1.12 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
 2015-05-12 20:09:49 +02:00
Alexander Morozov
baa93a3d54 Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup 
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
 2015-05-12 10:27:43 -07:00
Antonio Murdaca
12071c528f Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e2acca67c8e089429c8a5d5171887e5de42e3917
Component: engine
 2015-05-11 19:56:41 +02:00
Ahmet Alp Balkan
365c18080f 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>
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
 2015-05-10 20:42:14 +00:00
Alexander Morozov
ab315ef02f Merge pull request #13093 from tianon/writeflusher 
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
 2015-05-09 09:39:17 -07:00
Ma Shimiao
560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Tianon Gravi
a9af2bce60 Move WriteFlusher out of utils into ioutils 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
 2015-05-08 12:33:33 -06:00
David Calavera
260671a89b Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt 
Fix error prompt for pull & import handler postImagesCreate.
Upstream-commit: 404412282dc917b4e810f71a996656ebdc048b3b
Component: engine
 2015-05-07 16:27:15 -07:00
Bharath Thiruveedula
0a2accc995 Removing the SetDaemon method 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
Upstream-commit: 94def48878294ff3b35f8724343b14e2c48a09f8
Component: engine
 2015-05-07 22:25:13 +05:30
David Calavera
b9064ad316 Merge pull request #12822 from brahmaroutu/container_stop_api 
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
 2015-05-07 09:38:59 -07:00
Srini Brahmaroutu
e580063058 Restapi for stop fails if ?t=int not present 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
 2015-05-07 15:43:50 +00:00
Antonio Murdaca
e90b34218e Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
 2015-05-07 01:49:16 +02:00
Arnaud Porterie
f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07:00
Adria Casas
3f873c25b6 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
 2015-05-05 08:54:28 +02:00
Tibor Vass
da6438ab18 Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
 2015-05-04 22:28:01 -07:00
Brian Goff
9531505238 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>
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
 2015-05-04 10:49:13 -04:00
Antonio Murdaca
d6d6bba166 Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7cfdb65aa43a4561adb919d170bba5e86d69bee
Component: engine
 2015-05-02 03:12:58 +02:00
Antonio Murdaca
016ac4bf61 Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
 2015-04-30 01:35:16 +02:00
Antonio Murdaca
954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
Tibor Vass
6a2c490ba2 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
 2015-04-27 14:13:03 -04:00
Julien Barbier
7a068916d5 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>
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
 2015-04-25 15:25:51 -04:00
He Simei
fcf89e495c Fix error prompt for pull & import handler postImagesCreate. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: daad696e091c931c8f0bf210c65d90db27b0af74
Component: engine
 2015-04-25 09:10:32 +08:00
Lei Jitang
734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Ma Shimiao
8910bbac66 clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 66acef865d7504605572b0d9566d9e250cf19bc2
Component: engine
 2015-04-24 08:38:14 +08:00
Antonio Murdaca
41061500b4 Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
 2015-04-23 23:36:29 +02: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
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