f220709916
Convert TestGetImagesJSON into several unit tests
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 627805f5f8895c3a3887c312f7b8f49a89e51732
Component: engine
2014-07-07 21:55:26 +02:00
1270978241
Merge pull request #6850 from leeplay/patch-2
...
Update README.md
Upstream-commit: 578513095c1f69227d7942d167fc41b6598d95ac
Component: engine
2014-07-07 11:50:27 -07:00
df92ffe131
Merge pull request #6702 from mrunalp/dev/helper_fns
...
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
2014-07-07 11:39:27 -07:00
111401852c
Merge pull request #6508 from mheon/signals
...
Increase size of buffer for signal forwarding with --sig-proxy
Upstream-commit: 860c664ccbe1fd680be3952034126d82ce73a064
Component: engine
2014-07-07 10:45:31 -07:00
35129fcf06
Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
...
add client OS and arch to docker version
Upstream-commit: dd89904ad3ad8147fb046db0e5fef9f6379f9a39
Component: engine
2014-07-07 10:15:30 -07:00
d1bf2949a1
Merge pull request #6823 from folieadrien/move_integration_tests
...
Convert TestGetImagesByName into unit and integration-cli test
Upstream-commit: 4a20c9b005362ffdaa6b1b71adab1063191cf9f5
Component: engine
2014-07-07 10:13:19 -07:00
4f072fe2fa
Merge pull request #6573 from mheon/ps_cleanup
...
Escape control and nonprintable characters in docker ps
Upstream-commit: 2ffd13bc3159ef3a1f97d9a59cfe7704264c2db1
Component: engine
2014-07-07 18:23:18 +03:00
bb9d32707c
add client OS and arch to docker version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: eceacb8334250b9f241b263f28372d5f35ada71d
Component: engine
2014-07-04 21:23:36 +10:00
7f05b13374
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: 649b50c0b71a21f8ea6b88c63008a0f909fe4113
Component: engine
2014-07-04 18:21:13 +09:00
bedc0093af
Update cli.md and man pages to match current cli
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: b07f193822d00e40580cd11320ed7e01b629f9d7
Component: engine
2014-07-03 10:22:20 +10:00
7c1601352b
Fixed numerous inconsistencies in command help text
...
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: SvenDowideit)
Upstream-commit: b59754bcb32fe5b8f416f407f71d2b50bb148c8a
Component: engine
2014-07-03 10:22:09 +10:00
6b22b2d896
Move TestGetImagesByName
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: f337a52a6ec01684c326a827adbe3d0b8b5f1f53
Component: engine
2014-07-03 01:39:08 +02:00
c4b0fae952
api.DockerCli: Extract pullImage into separate function
...
This lets us reuse this code later.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 2b3959c414ffe9403e53617ed1a160c1daabeeaa
Component: engine
2014-07-02 16:33:14 -04:00
e0255ad153
Merge pull request #6763 from folieadrien/master
...
Migrate TestGetImagesHistory into unit and CLI test
Upstream-commit: deb57c5144f75dc6e1e73194c86991264048ca4a
Component: engine
2014-07-02 19:44:21 +03:00
fe06e048c4
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e06d533cc20c6aab10bf28a610445e7de6a8ef42
Component: engine
2014-07-01 21:59:08 +00:00
c1f6739a06
Implement tail for docker logs
...
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
e49c262737
Merge pull request #6787 from vieux/pause_commit2
...
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
2014-07-01 10:11:18 -07:00
4dbce92b61
Merge pull request #6366 from proppy/add-proppy-server
...
api/MAINTAINERS: add proppy for server/
Upstream-commit: bc33ce0d8f8b3c3b3e80fbd4084f8a8e74130c0c
Component: engine
2014-06-30 17:44:02 -07:00
ae1f05d70a
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com > (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
795e9b6d57
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
Upstream-commit: 36c78c917240312e5521eccb195ccce31b29d0f8
Component: engine
2014-06-30 10:41:07 -04:00
772cf3bd50
Add missing test for full coverage
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: c2699d8d896d592dc02276d76dfdf544fd26d0dd
Component: engine
2014-06-30 09:36:46 +00:00
866640533b
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
Upstream-commit: b4df555d27603621eacbcabb19d1db52bc370c86
Component: engine
2014-06-30 13:16:38 +10:00
845fae8efc
Migrate TestGetImagesHistory into unit and CLI test
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 9a2771eac22950fce43702896052f5187944de6d
Component: engine
2014-06-30 01:31:16 +02:00
4d2725fe4d
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a0b229071394e6534808f16c4570ed8fd9ff3a1c
Component: engine
2014-06-27 23:09:41 +00:00
47f54ad882
abort on error and fix debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0098360726e3df99e8f76dce9221a85dd89c2065
Component: engine
2014-06-26 22:49:08 +00:00
a23ad7fc08
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
2014-06-26 22:49:08 +00:00
10316c12ae
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
2014-06-26 11:59:49 -07:00
befb61a0bc
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
2014-06-26 08:41:58 +01:00
c384cf54c2
Add missing parenthesis in docs for -author switch
...
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: misfo)
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: SvenDowideit)
Upstream-commit: 3fcb0d880aad65690cac304c30f72d0688a801d2
Component: engine
2014-06-26 11:06:45 +10:00
f6a0457a3f
Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
...
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
2014-06-25 19:10:19 -04:00
a8f5e76a89
Update documentation noting that SIGCHLD is not proxied.
...
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: be4f4599a6d2a517e615dc1f64527a3f2ad2f683
Component: engine
2014-06-25 09:08:02 -04:00
126ec1c58c
Merge pull request #6216 from gsalgado/convert-integration-tests
...
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
Upstream-commit: f6d11c8d50387472fd7e34eea66b79237238c321
Component: engine
2014-06-24 14:53:10 -04:00
986327e6e1
return 304 is status isn't modified in start and stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
2014-06-24 18:31:56 +00:00
403b31a70b
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
2014-06-24 17:43:26 +02:00
90c80009e3
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +10:00
2e2569f2c6
Merge pull request #6620 from vieux/deprecate_tag_args
...
Remove old tag format
Upstream-commit: 6a762e859494eb73cbd92a41d5268a523996aa41
Component: engine
2014-06-23 17:24:20 -07:00
794a8c5ccb
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
2014-06-23 13:34:09 -07:00
82240e2b85
Remove old tag format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8228d0e2bbd3a42755a84e11455b51a5caf61a94
Component: engine
2014-06-23 17:52:03 +00:00
929a82a086
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
23fd1b998a
Merge pull request #6516 from LK4D4/validate_logs_params
...
Validate that one of streams choosen in logs on api side
Upstream-commit: 8ee1f2a9e9dc1ef025b1551f1f5b676116c83cfa
Component: engine
2014-06-20 13:43:31 -07:00
3ee2658a4c
Escape control and nonprintable characters in docker ps
...
The docker ps command displays the user-entered command running in a container.
If that command contained \n, \t, or other control characters, they were
interpreted literally, and newlines and tabs would be printed in the output.
Escape the command string to make things more readable.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: f55fa8211b6faf08091dd99ed8e5e3f08ab9cf1f
Component: engine
2014-06-20 12:22:31 -04:00
b42966840e
cleanup all mentions of insert
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3e2a9f667fbfd2b526b5bab4f8983f8c44685e87
Component: engine
2014-06-18 23:13:54 +00:00
c2a150d53c
Validate that one of streams choosen in logs on api side
...
Fixes #6506
There is the bug, that very hard to fix: When we return job.Errorf in
"logs" job it writes to job.Stderr, to which connected ResponseWriter and on
this write w.WriteHeader(http.StatusOK) is called. So, we get 200 on error
from "logs" job.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 216b4c9cf6cbdc9cd620de4edfbcd754a2184559
Component: engine
2014-06-18 23:34:46 +04:00
cbe82680cb
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
Upstream-commit: f53b922f40c43a58c1c7d3ff1ee489e137837a10
Component: engine
2014-06-18 11:02:17 -07:00
172faefd3c
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
df1151b70b
Merge pull request #6487 from vbatts/vbatts-error_info
...
adding a little uniqueness, to wrapped errors.
Upstream-commit: 331ae9c0f8a57b34b91b460350d0a354822d0091
Component: engine
2014-06-18 11:43:59 -04:00
7d1a57a5be
Increase size of buffer for signals
...
The chan struct used to forward signals to containers was one element only,
which caused some signals to be dropped when many were being received.
Increasing the size of the chan buffer makes this much less likely to happen.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: 06cd125e64c30886f66e6490a1cd4e7a7ba23655
Component: engine
2014-06-18 10:51:44 -04:00
1c06016fa3
adding a little uniqueness, to wrapped errors.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4902f047d3c6c37138a51bee05a3a48552619884
Component: engine
2014-06-17 16:07:34 -04:00
6e1924abe9
Convert TestGetContainersByName into a unit test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: c44c98edec6822edf17cc969038e21be6ccdbd93
Component: engine
2014-06-17 07:56:57 +02:00
7d55b5369e
do not alter json in docker save
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3e4e8636c1b05626cae720b47ef99109077e1d3a
Component: engine
2014-06-17 00:06:21 +00:00
