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
5a6db4fd44
a few cleanups for client output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-05 15:59:17 +08:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
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
15313dfdf3
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
2015-05-03 11:10:14 -04:00
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
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
d9639409fd
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-01 20:23:44 +02:00
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
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
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 01:35:16 +02:00
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
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
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
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
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-27 12:41:03 +08:00
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
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
1cfb307d70
Remove duplicated git clone logic.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-24 09:39:45 -07:00
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-24 08:54:08 +08:00
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-24 08:38:14 +08:00
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
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
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
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
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
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
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
3c9ae03a86
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
2015-04-22 15:32:14 -07:00
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
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
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
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
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
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
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
edf541c22b
gofmt whole directory
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-20 01:08:51 -07:00
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
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
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
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
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
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
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-14 11:27:06 -07:00
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
69747b3c1e
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
2015-04-14 18:33:11 +01:00
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-14 01:37:36 +02:00
6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
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
d6d8f45b04
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>
2015-04-11 20:04:34 +08:00
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
5037297388
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>
2015-04-10 00:08:05 -04:00
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:41 -04:00
3e096cb9c9
Remove Job from `docker top`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 18:17:50 -07:00
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 13:05:31 -07:00
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 19:39:14 +02:00
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-08 18:50:29 -04:00
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 10:30:17 -07:00
6e44246fed
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-06 14:31:42 -07:00
dec48d6708
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
2015-04-06 16:33:29 -04:00
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
065648a832
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-06 10:55:53 -07:00
b2fbd9e632
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
2015-04-03 21:29:36 +00:00
67b4cce0f6
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>
2015-04-03 11:27:30 -07:00
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 08:31:30 -07:00
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-03 08:55:34 +08:00
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-02 16:55:58 -07:00
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-01 07:37:10 -07:00
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-01 16:05:14 +08:00
03d3d79b2b
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>
2015-03-31 16:38:04 -07:00
ddbc68f564
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
00a15227f8
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
5670c6c695
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-29 03:22:46 +02:00
8b795a05a8
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2015-03-28 17:55:45 +01:00
013fb87543
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-28 09:07:20 +08:00
6d21b2ba80
Replace fmt.Fprint* with io.WriteString
...
This fixes vet warnings in api/client/stats.go
Fixes #11825
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-27 13:08:20 -07:00
ebbceea8a7
windows: monitorTtySize correctly by polling
...
This change makes `monitorTtySize` work correctly on windows by polling
into win32 API to get terminal size (because there's no SIGWINCH on
windows) and send it to the engine over Remove API properly.
Average getttysize syscall takes around 30-40 ms on an average windows
machine as far as I can tell, therefore in a `for` loop, checking every
250ms if size has changed or not.
I'm not sure if there's a better way to do it on windows, if so,
somebody please send a link 'cause I could not find.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-26 16:08:05 -07:00
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
6b2eeaf896
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com>
2015-03-26 18:59:16 +00:00
708ed9d87a
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
2015-03-26 10:58:35 -07:00
b9d19fdaef
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
2015-03-26 09:28:33 -07:00
2a5a402c71
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 20:07:00 -07:00
a465e26bb0
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 19:54:29 -07:00
0cd6c05d81
Fixes hacks from progressreader refactor
...
related to #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-25 18:21:02 -07:00
b5d0380108
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 14:17:11 -07:00
161c2e5e74
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-25 12:04:15 -07:00
0d65069a17
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-25 08:45:14 -07:00
58690c9cca
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com>
2015-03-24 23:57:23 -04:00
8eee55a35c
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
2015-03-24 11:45:07 -07:00
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 18:19:59 +01:00
babd1b3e1f
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 09:57:01 +01:00
e6b7d93072
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
2015-03-23 17:52:15 -07:00
d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
0c3d2f6f96
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 00:41:54 +01:00
Arnaud Porterie
Qiang Huang
Tibor Vass
Brian Goff
Doug Davis
jmzwcn
Alexander Morozov
Antonio Murdaca
Doug Davis
Lei Jitang
He Simei
Julien Barbier
David Calavera
Ma Shimiao
Srini Brahmaroutu
Jessie Frazelle
jianbosun
Peggy Li
Jessica Frazelle
Hu Keping
Ankush Agarwal
Dave Henderson
Deshi Xiao
Phil Estes
Megan Kostick
buddhamagnet
Michael Crosby
Chen Hanxiao
Tibor Vass
David Young
Alexander Morozov
Ahmet Alp Balkan
Yuan Sun
Deng Guangxing
Michael Crosby
Jamie Hannaford
Don Kjer
bobby abbott
Joey Gibson