docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
9,120 Commits 12 Branches 295 Tags
518e2ca12cdead7545af6ceb44266c97bb59ea81
Commit Graph

195 Commits

Author SHA1 Message Date
Tibor Vass
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
Tibor Vass
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
Victor Vieux
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
Guilherme Salgado
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
Sven Dowideit
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
Victor Vieux
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
Johan Euphrosine
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
Victor Vieux
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
unclejack
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
Michael Crosby
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
Victor Vieux
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
LK4D4
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
Michael Crosby
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
LK4D4
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
Tibor Vass
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
Vincent Batts
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
Guilherme Salgado
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
Victor Vieux
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
Michael Crosby
e29c2c6bde Totally remove insert feature 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a145b022a3b50b0d04cb0471d517f7c6c5efc67
Component: engine
 2014-06-04 17:35:15 -07:00
Victor Vieux
c4f9e05e7e Merge pull request #6204 from crosbymichael/no-structs 
Remove the API container struct and use env
Upstream-commit: aa05170a82a857aa6f1257d4554828c08c2015f6
Component: engine
 2014-06-04 16:40:20 -07:00
Michael Crosby
5f73b1bc4e Remove the API container struct and use env 
This change touches docker logs, attach, and start -a along with get
exit code in the client.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 91757eaeb3523679b30afee61c1dede33c8664c9
Component: engine
 2014-06-04 15:37:49 -07:00
Ian Main
77114664a4 Add ability to pause/unpause containers via cgroups freeze 
This patch adds pause/unpause to the command line, api, and drivers
for use on containers.  This is implemented using the cgroups/freeze
utility in libcontainer and lxc freeze/unfreeze.

Co-Authored-By: Eric Windisch <ewindisch@docker.com>
Co-Authored-By: Chris Alfonso <calfonso@redhat.com>
Docker-DCO-1.1-Signed-off-by: Ian Main <imain@redhat.com> (github: imain)
Upstream-commit: b054569cde788b2111ddbc4080b215dcda89f06e
Component: engine
 2014-06-04 13:33:44 -06:00
Victor Vieux
0f498972d9 Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context 
Change 'Uploading context' wording
Upstream-commit: 3704996089822f3df82c4b5441624418b7e3341d
Component: engine
 2014-06-03 23:58:20 -07:00
James Turnbull
6fe0f07752 Changed all references from Trusted Builds to Automated Builds 
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 9fc8028c987ac560ceb3b29eb609d77a82abdacc
Component: engine
 2014-06-03 12:55:30 -07:00
Vincent Batts
0c475a0cf3 filters: don't encode empty set. API docs 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 02255ddaa4948fd94450fd5d9d2ee9b147e88352
Component: engine
 2014-06-03 12:19:26 -04:00
Vincent Batts
2a107417ae filters: use json marshal, instead of beam/data 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 89a15fa235f0aab6dd326a3737260c983f0fc22b
Component: engine
 2014-06-02 16:33:52 -04:00
Vincent Batts
e355fe478a filters: change untagged to dangling 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 3ecfaa8f2da60bb4e6ce6c9ae0428bc7b647e34b
Component: engine
 2014-06-02 16:33:52 -04:00
Vincent Batts
2dd212e295 filter flag: split out for separate --filter flags 
adding tests and allowing for easy passing of filters.Args from client
to server.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: f1cc7ce5d728d6bdb1b3ab668e36fb1fc66515ff
Component: engine
 2014-06-02 16:33:51 -04:00
Vincent Batts
9030fc74aa filters: cleanup & fmt 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: babd5720157898bb33d806bda920d9f9f2df73f0
Component: engine
 2014-06-02 16:33:51 -04:00
Vincent Batts
f90ca07ea9 filters, for images: start with untagged/tagged boolean 
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
  example like: docker rmi $(docker images -q --filter 'untagged=true')

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5f3812ec97f9a951bceb482fdcd355b6cbc1b113
Component: engine
 2014-06-02 16:33:50 -04:00
Victor Vieux
2a289bda14 Standardize API keys: CamelCase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 68fb7f4b744bf71206898d32fe203556a6261e5d
Component: engine
 2014-05-31 01:22:07 +00:00
Michael Crosby
1f86bb208b Merge pull request #5947 from glebfm/fix-socket-race-condition 
Fix race condition during socket creation
Upstream-commit: 8ac516094e5b90351cbb436477f06730b1b5e38d
Component: engine
 2014-05-30 15:07:06 -07:00
Robin Speekenbrink
62daf025f0 updated documentation for mentioning images vs containers 
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
 2014-05-29 11:20:41 +10:00
FLGMwt
be791faeb8 Change 'Uploading context' wording 
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
Upstream-commit: 50417f6abc6d6de7cf32e956d538fd9103c5f9b4
Component: engine
 2014-05-28 11:59:29 -05:00
Michael Crosby
456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm 
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
 2014-05-22 10:54:05 -07:00
Dan Walsh
0ca8d92d2e This check was backwards. 
If I do a

docker events  > /tmp/out

I do not want the control characters getting written to the file.
The check should check the output file not the input file.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 26b4a4920adca614f6be17a96f254f331271faf0
Component: engine
 2014-05-21 17:37:40 -04:00
unclejack
d4e2ce7c3d Merge pull request #5954 from vieux/fix_cp_error 
Ignore lchown error on docker cp
Upstream-commit: a94a87778cf21440ff8f9bc8866d12903d590e88
Component: engine
 2014-05-21 15:55:57 +03:00
Victor Vieux
786a16cf57 ignore lchown error on docker cp 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 9e51b7abaea3fb30dc994a1d004cd79f2e100c1a
Component: engine
 2014-05-21 00:23:17 +00:00
Michael Crosby
b9dbdb7d9e Merge pull request #5755 from vieux/move_inspect_daemon 
move inspect from server to daemon
Upstream-commit: 83e9dc720039cfa8685b8dc59f76ca2f1e9489d2
Component: engine
 2014-05-20 15:50:38 -07:00
Victor Vieux
74d86a8d61 move inspect from server to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
 2014-05-20 19:36:15 +00:00
Gleb Fotengauer-Malinovskiy
24dcd76db5 Fix race condition during socket creation 
Docker-DCO-1.1-Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> (github: glebfm)
Upstream-commit: 24c73ce2d3d572313fe56bad08819e0ca8b74d26
Component: engine
 2014-05-20 23:22:06 +04:00
Dan Walsh
df1cb6f1b5 docker '' causes a golang crash. 
This patch fixes the problem.

Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bc081a03d85a88cc2160ade9256d96d7b84c4caa
Component: engine
 2014-05-20 14:04:27 -04:00
unclejack
4c017922d1 default to deleting images via the remote api 
This makes the remote API version 1.12 and newer default to
automatically deleting intermediate containers when the build has
succeedeed.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b60d6471721bc914dca179a4372303d41913cc4c
Component: engine
 2014-05-19 23:10:54 +03:00
unclejack
978fda27ac bump remote api to 1.12 & add --force-rm to build 
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.

This new flag requires that we bump the remote API, so we also bump the
remote API version.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 667e2bd4ea5fbc8698c34565f955cb92cff92890
Component: engine
 2014-05-19 23:10:49 +03:00
Victor Vieux
44cdecc9bf Merge pull request #5874 from timthelion/docs-api-readme 
Add readme file for the api directory
Upstream-commit: 3fa96c55e3e57fa6a76581bcefa63a4da1a4f2cb
Component: engine
 2014-05-19 10:50:00 -07:00
Victor Vieux
f45c8a5e25 Merge pull request #5782 from unclejack/fix_5270 
Upstream-commit: 8eef1be29e763db58a22d336b71d97c076a11199
Component: engine
 2014-05-19 10:36:10 -07:00
Jonathan McCrohan
95b5064ed6 client: Rip out HTTP check from docker version 
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 3cec63d56f9de6332aa3f33502695283d4feb054
Component: engine
 2014-05-18 02:22:22 +01:00
Jonathan McCrohan
32ad2ac698 client: rearrange docker version output 
Rearrange docker version output so that server output matches client
output

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 82712ed67ef9c189ccc8837ef8469272c91f6fcf
Component: engine
 2014-05-18 01:49:58 +01:00
Timothy
6374fe2fa3 Add readme file for the api directory 
See issue #5873

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 3e2b97ef26467228f6018e19f517ed535e107026
Component: engine
 2014-05-17 17:37:05 +00:00
Victor Vieux
06d0a8ebde Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer 
allow 2 docker events to be opened on the same computer over unix socket
Upstream-commit: 9e7757a3d25947d5ef8f8882baae0bacd6fb1f49
Component: engine
 2014-05-16 18:17:46 -07:00