3253386751
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
2014-11-25 18:03:51 -08:00
039ddfff8b
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
2014-11-25 17:52:27 -08:00
c28ef478d3
Add support for docker exec to return cmd exitStatus
...
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.
Closes #8703
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
2014-11-25 17:49:25 -08:00
033a9598e5
Update code for use of urlutil pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5794b5373ef26846b3cc5e48e651208771d12b19
Component: engine
2014-11-24 18:47:42 -05:00
b6f3cebe53
Merge pull request #9281 from unclejack/build_pull_flag
...
build: add pull flag to force image pulling
Upstream-commit: 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Component: engine
2014-11-24 12:10:45 -08:00
17175863b2
Merge pull request #9188 from somaopensource/8777-fix
...
Fix for #8777 (continuing PR #9061 )
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
2014-11-21 17:57:56 -08:00
d66b329d87
Merge pull request #9270 from jfrazelle/8919-tag-output
...
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
2014-11-22 01:56:31 +02:00
19f9fcbc25
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
2014-11-21 19:59:44 +02:00
0e1ef24503
Fix tag output where image is not found.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: e527be1f14eda5a3d9077517a0398d85c4d7fac6
Component: engine
2014-11-20 15:09:09 -08:00
49be3bdeb0
Fix create container output messages.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 7a7890950d59abf7bc4f826c605289e1d7586390
Component: engine
2014-11-20 15:03:27 -08:00
f6afb58177
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00
35fec2c425
add daemon labels
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Component: engine
2014-11-20 19:23:58 +00:00
fa056c1bc9
Merge pull request #9201 from vieux/add_hostname_docker_info
...
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
addb2d43fa
Hostname -> Name
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
2014-11-20 17:40:08 +00:00
313de46eb6
Fix for #8777
...
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Component: engine
2014-11-20 13:36:46 +09:00
f35e467fb4
Merge pull request #9211 from mtesselH/login
...
Fixed a bug - no panic anymore when logining in without TTY
Upstream-commit: d4ca9e5cce2ff7e08750123609df1864e0befdcf
Component: engine
2014-11-19 17:52:35 -08:00
e390ce1d8e
Merge pull request #9144 from miminar/sigproxy_tty
...
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
2014-11-19 14:52:01 -08:00
1b2e957b5a
Fix steam where it should be stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Component: engine
2014-11-18 10:49:01 -08:00
16ad3a4d02
Fixed a bug - no panic anymore when logining in without TTY
...
Fixes #8956
Signed-off-by: Marianna <mtesselh@gmail.com >
Upstream-commit: e6fd57b90bcdd3b0105fa5c7d17a64332f829ded
Component: engine
2014-11-17 19:41:27 -08:00
5d1b12a860
Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer
...
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
2014-11-17 17:42:27 -07:00
f066184384
add ID and Hostname in docker info
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
2014-11-17 19:23:41 +00:00
deefafa9d6
Remove unused sysinfo parameter to runconfig.Parse
...
Removing dead code.
Signed-off-by: John Gossman <johngos@microsoft.com >
Upstream-commit: e45b0f92711ff190cff4b61b2ea80cdd53203a16
Component: engine
2014-11-14 18:20:54 -08:00
2e7196248a
Extract client signals to pkg/signal
...
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
2014-11-14 18:20:53 -08:00
ba50e8beb2
Merge pull request #9108 from vieux/handle_redirects
...
handle GET redirects over HTTP
Upstream-commit: df603eb4e400f9ed4fa88d956f53ad80b244c376
Component: engine
2014-11-14 12:07:22 -08:00
7632ac2e44
use _, _ string
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 454f56e37eefd072e350739a6c5a06743ff913ef
Component: engine
2014-11-14 19:31:52 +00:00
bb5bcd8e79
Merge pull request #9131 from vieux/empty_lines_dockerinfo
...
Do not display empty lines in docker info if the key doesn't exists
Upstream-commit: 967354d48818eebf9ce706bbd4914a20a0375de8
Component: engine
2014-11-13 19:08:32 -08:00
f5a6597726
Do not display empty lines in docker info if the key doesn't exists
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4f5be9da86ffed40b810bb1840c19526a9156ab3
Component: engine
2014-11-14 02:50:34 +00:00
a56997089b
Corrected description of --sig-proxy
...
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
2014-11-13 10:50:06 +01:00
22cdb1d809
Cleanup:change latest to graph.DEFAULTTAG
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
2014-11-13 16:21:34 +08:00
a7280b07fa
update timeout
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
2014-11-13 03:21:18 +00:00
ad5fd5c082
fix unix socket
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 6ca144ef3d62e358327249546bf83ce1e347be5c
Component: engine
2014-11-12 00:37:58 +00:00
f37e910c9f
handle GET redirects
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
2014-11-12 00:37:58 +00:00
a14eceb8d8
makes the -s --size option documentation clearer #8950
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6dc11cc992531a2cf75666e417af7730a7f0764b
Component: engine
2014-11-07 11:56:56 +10:00
ab8d055502
Merge pull request #8345 from duglin/Issue5184
...
Add a better error message when we get an unknown http issue
Upstream-commit: b79211f4ae0f08975d02c5d51bb482f965d60a88
Component: engine
2014-11-04 20:07:41 -05:00
1a2c21becb
Add a better error message when we get an unknown http issue
...
Closes #5184
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6fdaa66652d65558d8225d58f3ac48904ebac1de
Component: engine
2014-11-04 16:46:41 -08:00
0e78b6c4a5
Merge pull request #8871 from tonistiigi/start-wait-hijack
...
Wait for hijack on docker start command
Upstream-commit: a34f31b488dce94314e3218e3d52c38747cabc2f
Component: engine
2014-11-04 08:46:56 -08:00
d3c1cd34ce
Merge pull request #8739 from duglin/CleanupDockerIgnores
...
Do some cleanup on .dockerignore paths
Upstream-commit: a85f58719f29f76f465747d095c85dbb8ba69d06
Component: engine
2014-11-03 16:05:24 -05:00
118bb8077c
Fix help text being incorrect with multiple args
...
E.g. "docker foobar run" would have printed "Command not found:
foobar" and printed the help text for "run". It should instead
print the root help message for docker.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: ef004ec03fe5aad33da7d53f196f16382c750d07
Component: engine
2014-11-03 16:46:01 +00:00
f115554d46
Do some cleanup on .dockerignore paths
...
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
"exclude". While this isn't causing an issue right now, I got worried
that in the future some code later on might interpret "" as something bad,
like "everything" or ".". So I added a check for an empty "exclude"
and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
However, if they put "./foo" then we won't due to the painfully
simplistic logic of go's filepath.Match algorithm. To help things
a little (and to treat ./Dockerfile just like Dockerfile) I added
code to filepath.Clean() each entry in .dockerignore. It should
result in the same semantic path but ensure that no matter how the
user expresses the path, we'll match it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: c0f0f5c9887032c606750b645001829d9f14f47c
Component: engine
2014-11-02 11:29:46 -08:00
4047c8a0da
Merge pull request #8468 from laktek/master
...
Fix URL check in build from Git.
Upstream-commit: 9cc71b459771d0cbac51051410859fd878236920
Component: engine
2014-10-31 14:43:21 -07:00
4454d2b409
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
2014-10-31 09:36:07 +08:00
79bfa611f5
Wait for hijack on docker start command
...
With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.
Fixed so the implementation matches with `docker run`.
This also fixes the flaky test results for TestCreateEchoStdout.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 79a77a396e003d0f5827c48d1b179f87c1542311
Component: engine
2014-10-31 01:13:31 +02:00
ec0d91155f
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
5292cfbc42
Merge pull request #8743 from vieux/hostconfig_start
...
do not send hostconfig at start, as we do on create now
Upstream-commit: 339173dd5be7ec8807448f83622aa88561c445a6
Component: engine
2014-10-27 11:09:57 -07:00
6c8bda9fe4
Merge pull request #8770 from LK4D4/logrus_support
...
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
2014-10-27 09:05:24 -07:00
fdfe0c97e7
Add HasValidGITPrefix to utils/utils.go
...
This will allow us to use a common Git prefix check for both api/clients/commands.go and
builder/job.go. Previous prefix check in build from Git (in builder/jobs.go) ignored valid prefixes such as "git@", "http://" or "https://".
Signed-off-by: Lakshan Perera <lakshan@laktek.com >
Upstream-commit: d3ac9ea98e872fee808693c736bc5a465d6426e2
Component: engine
2014-10-26 03:25:25 +00:00
9609160b54
Merge pull request #8321 from erikh/ui_save_output
...
docker save: Do not save to a terminal.
Upstream-commit: 350e1b783d4deafbb62ede4d17df37dbaffa373a
Component: engine
2014-10-24 19:37:14 -04:00
e6c9b85c85
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
2d56e3cbc6
Use logrus everywhere for logging
...
Fixed #8761
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
ea99d5664f
do not send hostconfig at start, as we do on create now
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 12028fc159c6c383b1b9e8810a7a41a7c6c985bc
Component: engine
2014-10-24 00:22:21 +00:00
