p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,091 Commits 2 Branches 295 Tags
18efee874d00a773f8df7b28431ec34070d2d2dd
Commit Graph

47 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Victor Vieux
ed8430a340 Merge pull request #5571 from vieux/fix_race_docker_daemon 
Fix race docker daemon
Upstream-commit: 00ce30bc7473b389579a44e55a01c818ebae84e1
Component: engine
 2014-05-16 13:57:43 -07:00
Victor Vieux
e1b6815b39 allow 2 docker events to be opened on the same computer over unix socket 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 81ffd6530aced5237c01bd13e80686da68de6637
Component: engine
 2014-05-15 23:27:36 +00:00
Victor Vieux
aba2e9f1f5 move acceptconnections as builtin 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 937f8f2d813f58480e4bb2c0060353be31b04e10
Component: engine
 2014-05-13 01:53:38 +00:00
Victor Vieux
cb8e10ccdc make listen buffer optional 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f3736265fdddef9e9a9ab588906eeb7abe8a0cf6
Component: engine
 2014-05-13 01:51:41 +00:00
Victor Vieux
cc0e75c911 remove addString and replace Tail 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e304e3a6624e740159e99e83d6d13f0a3cdfeb49
Component: engine
 2014-05-09 18:09:59 +00:00
Victor Vieux
fda92cf483 Revert "refactor build job to know only configFile" 
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
 2014-05-07 22:59:13 +00:00
Victor Vieux
f18c414a67 Revert "rename configFile to auth in the job" 
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
 2014-05-07 22:58:09 +00:00
Victor Vieux
eebd02a00b Merge pull request #5569 from vieux/add__ping_to_the_API 
Add  ping to the api
Upstream-commit: f369278725a2c31f5fa2ba2da33ad513f54a5897
Component: engine
 2014-05-05 10:09:31 -07:00
Solomon Hykes
f8cb02bd82 api/server: better error checking to avoid unnecessary panics 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: f37ce76bf68d4935accd1018c904e80e42066f9f
Component: engine
 2014-05-02 16:03:37 -07:00
Victor Vieux
18e1876580 return write error 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c65de2c0207ac67e5023ada8709490ef4627bd01
Component: engine
 2014-05-02 22:03:59 +00:00
Victor Vieux
11bde7fe02 add _ping endpoint 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: cf0076b92dd11b3bda9ac7982e374d4531925ff9
Component: engine
 2014-05-02 21:43:51 +00:00
Alexandr Morozov
6a260a1e42 Timestamps for docker logs. 
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: d1297feef8b124e69efc99a58294f498ecb8c022
Component: engine
 2014-05-01 20:40:36 +04:00
Michael Crosby
d8eb119f29 Remove error from engine.New() 
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
 2014-04-23 11:54:35 -07:00
Michael Crosby
e886c73325 Update tests with engine root removal 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87e8d7754e218d93b480b94537d07793f6680515
Component: engine
 2014-04-22 19:24:47 -07:00
Victor Vieux
51ab1031ea rename configFile to auth in the job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e9c3e397436221528312c0d3b291ae5a12862ed2
Component: engine
 2014-04-14 17:15:22 +00:00
Victor Vieux
f3aecbde7d refactor build job to know only configFile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
 2014-04-10 22:29:03 +00:00
O.S. Tezer
a6fc08c279 Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature 
Adding timestamp end to events endpoint. Modifying api docs.
Upstream-commit: a521388863502014bdea80585b7272a854191244
Component: engine
 2014-04-10 20:54:53 +03:00
Isabel Jimenez
825d583586 Adding timestamp end to events endpoint. Modifying api docs. 
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
Upstream-commit: 66dd4ea4e280e4acc133872401bf8a79c80510f3
Component: engine
 2014-04-10 10:43:21 -07:00
Solomon Hykes
39daf771d4 Make remote API unit tests easier to read and write 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1e6f21dc9e7b172b28d364741abb92540938c51a
Component: engine
 2014-04-08 18:14:47 -07:00
Michael Crosby
0f551f19fb Use setjson hack again for version 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4c6cf9e27fd0ee6c09e836f03722d1c679b6bd29
Component: engine
 2014-04-04 11:37:08 -07:00
Michael Crosby
bc3cbf9f38 Merge pull request #5005 from shykes/deprecate-insert 
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
 2014-04-03 17:16:25 -07:00
Solomon Hykes
8e7c545689 api/server: convert TestGetInfo from an integration test to a unit test. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2cb560988b111ee736c4ab22588d2091cb04075e
Component: engine
 2014-04-04 00:02:44 +00:00
Solomon Hykes
2948228586 api/server: replace an integration test with a unit test using engine mocking. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c8f437aee0d90d4955a6aaa35f8e0b74e7ac99a3
Component: engine
 2014-04-03 23:53:39 +00:00
Solomon Hykes
96808698c3 Deprecate 'docker insert' 
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
 2014-04-03 23:52:09 +00:00
Guillaume J. Charmes
d9e5457b6e Update Version to not use string anymore 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3ee37f547f4685ab88bfc39517cc18c1911451e5
Component: engine
 2014-04-01 15:46:52 -07:00
Guillaume J. Charmes
9ef93e6d75 Allow push of a single tag 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
 2014-03-31 18:50:10 -07:00
Victor Vieux
9772d36088 fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
 2014-03-31 18:11:53 +00:00
Victor Vieux
14450304fa split API into 2 go packages 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a7365a6237c45ed05d96ab11f36fde35d675b462
Component: engine
 2014-03-31 18:10:02 +00:00