Jessie Frazelle
54ac8d85af
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
Upstream-commit: 3c9ae03a868bb86fdb3026a21ef1b9a3f6a75dfb
Component: engine
2015-04-22 15:32:14 -07:00
jianbosun
f089bf1e0a
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 >
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
2015-04-22 13:51:57 -07:00
Peggy Li
ed4e61e70a
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: 58065d0dd9adec4b2f397a453652cc8cc7237a17
Component: engine
2015-04-22 00:14:23 -07:00
Jessie Frazelle
23af23a14a
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
2015-04-20 17:28:24 -07:00
Jessie Frazelle
a2ec388af9
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
2015-04-20 17:02:43 -07:00
Doug Davis
44c88b9112
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 >
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
2015-04-20 13:05:24 -07:00
Hu Keping
899b777d56
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 >
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
2015-04-20 18:14:06 +08:00
Ankush Agarwal
396287023b
gofmt whole directory
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: edf541c22b5253a980ee061b35110d0da8fdb905
Component: engine
2015-04-20 01:08:51 -07:00
Arnaud Porterie
10d974ead9
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 >
Upstream-commit: ae5cf30c7c6630d201ef14e2e460f4164f58a261
Component: engine
2015-04-16 08:38:18 -07:00
Dave Henderson
8b3da7ead2
Adding a verbose time option to output formatted timestamps
...
Fixes #11413
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
Upstream-commit: dcff07d03d9accbedd2467fe9c7c10fba7c2b35c
Component: engine
2015-04-16 08:34:50 -07:00
Alexander Morozov
1fe5faa4a6
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
Upstream-commit: 83d809f3d2742b85933ba8a93fa7d46fe48495dc
Component: engine
2015-04-15 17:34:38 -07:00
Deshi Xiao
1931a4d310
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 >
Upstream-commit: bae3023eef0ed8e0eb517ca53f6f97f1bf6786d3
Component: engine
2015-04-16 01:27:07 +08:00
Qiang Huang
9f222f171d
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
2015-04-15 09:34:12 +08:00
Phil Estes
0d57506a8e
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
Upstream-commit: 5395cdcae58d867070cb78873fd5f51b72a5cfef
Component: engine
2015-04-14 17:55:13 -04:00
Megan Kostick
78eb19684c
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 98f857772f3be0985ab87c4bc6bd91e80e122c53
Component: engine
2015-04-14 11:27:06 -07:00
Alexander Morozov
eb09b49e6e
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
Upstream-commit: 5be5749d544702c5da37c8ab448b417daf13e297
Component: engine
2015-04-14 11:00:19 -07:00
buddhamagnet
1ec6ea18ce
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
Upstream-commit: 69747b3c1e254d78619b2d66340f5d5172280d90
Component: engine
2015-04-14 18:33:11 +01:00
Antonio Murdaca
a4111cba55
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
2015-04-14 01:37:36 +02:00
Michael Crosby
483871b67f
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
2015-04-13 13:32:45 -07:00
Michael Crosby
20c653370b
Merge pull request #12222 from chenhanxiao/cp-support-colon
...
cp: add support for copy filename with ":"
Upstream-commit: 75b911eb3cb12e4c4d86fd42aa12bc71458f77b1
Component: engine
2015-04-13 13:09:12 -07:00
jianbosun
ca227f7854
change memory usage display
...
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Upstream-commit: d6d8f45b04a6e6d0b616c85d1885342d3e676ec1
Component: engine
2015-04-11 20:04:34 +08:00
Michael Crosby
1f992e6c96
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
2015-04-10 10:56:01 -07:00
Chen Hanxiao
88ea73a6aa
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 50372973884d96ee115094336ed1952b1e71250a
Component: engine
2015-04-10 00:08:05 -04:00
Tibor Vass
5ed91523df
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
David Young
807d6f107a
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
Doug Davis
681bfa410b
Remove Job from docker top
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3e096cb9c9e9d708df7982be5694daaa62bb4849
Component: engine
2015-04-09 18:17:50 -07:00
Alexander Morozov
bdab727fe0
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
Upstream-commit: 67676529b373c39c239ff7c8f4a374ae97659523
Component: engine
2015-04-09 14:10:21 -07:00
Alexander Morozov
1164c8a3e0
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ccdef895def5e42706e792b4891ad2d06bbf488a
Component: engine
2015-04-09 13:05:31 -07:00
Antonio Murdaca
b19229f86e
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e4afc379dcee66475f3becb34cd2675f3ee9279c
Component: engine
2015-04-09 19:39:14 +02:00
Tibor Vass
0c091d906f
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 53582321ee502335a9c3be4789bef984e09f77c4
Component: engine
2015-04-08 18:50:29 -04:00
Doug Davis
b3b1e4936b
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
2015-04-08 10:30:17 -07:00
Ahmet Alp Balkan
02aa86f034
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 6e44246fed43341938a41c6db9b115e1e64d332a
Component: engine
2015-04-06 14:31:42 -07:00
Phil Estes
d69d67a964
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
Upstream-commit: dec48d6708aa9fc7732d2451d9913e612fc989be
Component: engine
2015-04-06 16:33:29 -04:00
Arnaud Porterie
142a5765d0
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
Doug Davis
ef8d6cbdf1
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
2015-04-06 10:55:53 -07:00
Jessie Frazelle
8973909f13
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
Upstream-commit: b2fbd9e632191e6d6494b7dfd4dc0798e1fa47c7
Component: engine
2015-04-03 21:29:36 +00:00
Doug Davis
938f87c2dd
Remove engine.Table from docker search and fix missing field
...
registry/SearchResults was missing the "is_automated" field.
I added it back in.
Pull this 'table' removal one from the others because it fixed
a bug too
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 67b4cce0f6c835cf9e53313a026af2e825ba8b10
Component: engine
2015-04-03 11:27:30 -07:00
Michael Crosby
c121c9b8d9
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
2015-04-03 10:57:52 -07:00
Doug Davis
3a500e0f89
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0b2fa9c707ab06836cf5dd7b3ca9efac64bba925
Component: engine
2015-04-03 08:31:30 -07:00
Yuan Sun
8c6dabaae6
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
2015-04-03 08:55:34 +08:00
Doug Davis
68cf0c513e
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
2015-04-02 16:55:58 -07:00
Tibor Vass
80f31b5c3f
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
Upstream-commit: 4467b6a2cbb2b075803e4a6cc10672871cb6c323
Component: engine
2015-04-01 16:32:41 -04:00
Doug Davis
99e92a4e37
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d351aef8afc5a215668248652aad52856949eaa0
Component: engine
2015-04-01 07:37:10 -07:00
Deng Guangxing
5a7a97d2b6
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
2015-04-01 16:05:14 +08:00
Michael Crosby
753b8ae08c
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 03d3d79b2b3f8b720fff2d649aff0ef791cff417
Component: engine
2015-03-31 16:38:04 -07:00
Tibor Vass
471b420e47
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
Upstream-commit: ddbc68f564156818b068c6b1b8b3ce61edfaad43
Component: engine
2015-03-31 11:14:04 -04:00
Michael Crosby
f6752519af
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
Upstream-commit: 00a15227f8c7679a4a5c1f90e61367a3d1be92df
Component: engine
2015-03-30 13:35:40 -07:00
Antonio Murdaca
0f80e9e5da
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
2015-03-29 03:22:46 +02:00
Jamie Hannaford
1bfc9627bf
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 8b795a05a8fa8a6f747ee5cc0c087bca9d42199d
Component: engine
2015-03-28 17:55:45 +01:00
Lei Jitang
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +08:00