608d55c5e6
Add more info on attach inspired by discussion in #2855
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 801edfa9b8a765e734ac4a909ab032f0cb03fe87
Component: engine
2014-10-13 17:30:08 +10:00
7a3f244d2c
Merge pull request #8508 from vbatts/vbatts-too_many_open_files
...
cleaner handling of client socket access
Upstream-commit: 7fa7c42ce2f151d438ad83fd2dcd5a0679015618
Component: engine
2014-10-11 11:16:23 +03:00
29fdd38079
Merge pull request #8393 from dmcgowan/provenance_pull_enhance
...
Make V2 code more defensive against malformed content
Upstream-commit: 9f482a66ab37ec396ac61ed0c00d59122ac07453
Component: engine
2014-10-10 17:19:59 -07:00
d2f7355324
Merge pull request #8505 from crosbymichael/ps-name
...
Improve ps name parsing
Upstream-commit: 246ec5dd067fc17be5196ae29956e3368b167ccf
Component: engine
2014-10-10 17:08:35 -07:00
abbb3a3dd3
cleaner handling of client socket access
...
In the go stdlib net/http Transport, the used connections are cached
when idled. This behaviour is intended for TCP connections and does not
behave correctly for unix sockets. Despite the
DefaultMaxIdleConnsPerHost being 2, the idled connections are held open
during a session. For large sessions like `docker rm $(docker ps -a -q)`
of thousands of containers, it will cause the client _and_ the server to
open too many fails and have failures.
Having keep alives not used for only unix sockets is a work around for
this stdlib issue.
Also this includes disabling compression when communicating over the
local unix socket too.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: fb7ceeb170447cdbef3e74a92358eb9b084c0bf7
Component: engine
2014-10-10 19:58:49 -04:00
e2a55f16e8
Enable V2 pull flow
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 3be4551a9164c5fac577e9e3683dea65c2fc193a
Component: engine
2014-10-10 16:09:56 -07:00
e2eeab4dd3
Update verification message
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 85fd8213afe9497da5df5583d776659ed187c9e9
Component: engine
2014-10-10 16:04:29 -07:00
0ae83cbb52
Support tarsum dev version to fix issue with mtime
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 73a9089306ac1ed25c594e54c9b2a11a0ac8e610
Component: engine
2014-10-10 16:04:29 -07:00
5ab2b8482f
Update manifest format to rename blobsums and use arrays of dictionaries
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 15d5c7f10f56faeaa04f6374341e1cfd3e03cab1
Component: engine
2014-10-10 16:04:29 -07:00
c77de695cd
Add status message for V2 pull
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 456f493659d92ef271bc3573c537d10ae5d0847b
Component: engine
2014-10-10 16:04:29 -07:00
3d8d2b7af5
Update pull message and log
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 7d21ea6627ae964425da9bc52bbb9e21b7da3cf9
Component: engine
2014-10-10 16:04:28 -07:00
045011f555
Use direct registry url
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a152f37674df3f2a31e60cbfb764fa348333e805
Component: engine
2014-10-10 16:04:28 -07:00
176bd2dcef
Make V2 code more defensive against malformed content
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: e8b8cf61a9c4f905befc3462e7e80ca7729ffe4d
Component: engine
2014-10-10 16:04:28 -07:00
c6f7674b40
Import ps name parsing for default name
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: b10dfb7de3c24cd6b4184d4228925517803f7ec7
Component: engine
2014-10-10 22:18:25 +00:00
a8b535acd0
on truncated output, show canonical name rather than first name
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
Upstream-commit: 4a5cefa1731ae99ee592e1898c6007904fb5943a
Component: engine
2014-10-10 08:12:15 +02:00
e5c1195d99
reflect changes introduced in d2ffcd9 in docs
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
Upstream-commit: 0099b5e68cc76080f01e9150d3a3b86e0cb2b741
Component: engine
2014-10-10 08:12:12 +02:00
0c992a32c1
Merge pull request #8384 from rhatdan/selinux-opts
...
Fix security-opt docs
Upstream-commit: 248ec5d74e4f33bbcf946609fc5f9081a267fb8b
Component: engine
2014-10-10 10:52:17 +10:00
7f74fd787f
Merge pull request #8496 from jfrazelle/update-desktop-examples
...
Update desktop integration examples to be more awesome.
Upstream-commit: 3b4143926268887237e99e8922b4f27228a87e3d
Component: engine
2014-10-09 18:44:03 -06:00
98819811ac
Update desktop integration examples to be more up to date.
...
Chromium > Iceweasel and cool new gparted example.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 8aa468ef56001ad2da3015383df2a8723ca1afa3
Component: engine
2014-10-09 17:13:13 -07:00
af887ed027
Merge pull request #8497 from aluzzardi/disable-stable-ip
...
Disable stable IPs.
Upstream-commit: 72d8d94284e8239bede8b6a6df14680d5d59c259
Component: engine
2014-10-09 15:54:33 -07:00
0ef343ce97
Merge pull request #8470 from fgrehm/patch-3
...
docs: Remove `Detach` parameter from Exec Create example
Upstream-commit: 88a41aa7d1f90c75086119553b06525ab16118be
Component: engine
2014-10-09 15:25:51 -07:00
161436147c
Disable stable IPs.
...
Stable IPs causes some regressions in the way people use Docker, see GH#8493.
Reverting it for 1.3, we'll enable it back for the next release.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 5b8379a4349105eb387a4b9836bbd1d83ebe6928
Component: engine
2014-10-09 15:15:17 -07:00
88981e88ba
Merge pull request #8495 from jpetazzo/8494-fix-debian-frontend-in-getdockercom-script
...
Add -E flag to sudo (fixes #8494 )
Upstream-commit: d095659c6eef1125fc710d4bcb637311efbb3d31
Component: engine
2014-10-09 18:05:18 -04:00
626b6d8233
Merge pull request #8482 from jfrazelle/8481-content-type-bump-v
...
Revert #8101 and #7886 (content-type:x-json-stream/line delimited json)
Upstream-commit: 917529e45e5ab1ec7f27003fda7d6d9be96995f6
Component: engine
2014-10-09 14:57:15 -07:00
bdbbff32ad
Add -E flag to sudo ( fixes #8494 )
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: e01e913d80dcbd509a003feb55c7cdb6fc9758c2
Component: engine
2014-10-09 14:54:22 -07:00
3b7c4216ab
Revert "Fix line delimited JSON response"
...
This reverts commit d2f75a3040e72562ffa825d5c3efa7004af2640a.
Conflicts:
integration-cli/docker_api_events_test.go
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: b66ac6a80990d382a3859cd5ca8c53f038bdc1ff
Component: engine
2014-10-09 13:46:21 -07:00
ffd31097c3
Revert "Change content-type for json stream to application/x-json-stream."
...
This reverts commit 10ab2089ce189d5bea3f7aaac3b5081471309478.
Conflicts:
api/client/utils.go
docs/sources/reference/api/docker_remote_api.md
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4c6b7cd1b560c72f2c79c28f77644f05b3ee657e
Component: engine
2014-10-09 13:17:47 -07:00
ee5a12c020
Fix security-opt docs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: a260772e48bdb69a2e95b78fccf9ea0fd1a9898b
Component: engine
2014-10-09 15:18:28 -04:00
94e55f882a
Merge pull request #8419 from nhsiehgit/dockerfiletut
...
Dockerfiletut
Upstream-commit: 2f5f437bc12164e7fa8ff935b5b29120d4f20adf
Component: engine
2014-10-09 10:15:10 -07:00
7b962aa326
Merge pull request #8461 from SvenDowideit/copy-specific-files-from-context
...
Add a best practice to reduce cache invalidations
Upstream-commit: 950f271ee4acd44fd6825fde9caabc694b1b13a8
Component: engine
2014-10-09 10:03:50 -07:00
e30e6f7d0c
Merge pull request #8457 from jfrazelle/pr_8455
...
Check /etc/resolv.conf every time for 127.* content
Upstream-commit: 4eb812e042e10e8158161ba7d6236a9ca8044ebe
Component: engine
2014-10-08 16:21:14 -07:00
d83fbbbf57
cleanup resolve.conf code
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: dbe6c6651e744bd6f6cab04fcaed2871779d36a0
Component: engine
2014-10-08 15:15:51 -07:00
939ae48706
Merge pull request #8450 from dqminh/fix-proxy-exit
...
dont close proxy's stdout/stderr prematurely
Upstream-commit: 0486bd022e7c51b23cc9b4d62b5faaf42ee9a101
Component: engine
2014-10-08 14:20:33 -07:00
87b92d77be
Merge pull request #8475 from cpuguy83/fix_create_phantom_volumes_on_container_restart
...
Fixes re-creating volume on (re)start
Upstream-commit: d7bcc099bec2b0ee4ff5c6411ae33f9e23bd94d1
Component: engine
2014-10-08 13:58:56 -07:00
c763054d93
added fixes to address comments
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 6a874cf711a7df5e60f1290e02fe4ca25851b985
Component: engine
2014-10-08 13:46:44 -07:00
d2ff407b2f
Squashed commit of the following:
...
commit 3f9e9185fe7ee51f2fe55f0fc0d4fffdc4f289dc
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:57:35 2014 -0700
changed the title of back buttons
commit f86934424e85931ec293e711ceaa93ee920828fb
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:53:15 2014 -0700
Finished level 2, refactored tests
commit 8f502bce05293cccaf200b69ce5f5826eee72484
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 08:52:37 2014 -0700
stylized better and added level 2
commit 07b2276b346c34c0cc0faa57500c40e120e77888
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 18:17:29 2014 -0700
broke tutorial tests styles
commit 35d84147dc2f65b0ffeea5faf304add903219b1e
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:23:48 2014 -0700
structured test level1 md file
commit 808d01b0d55d67eb1017f290a29da6c7d38565f2
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:15:46 2014 -0700
Modified files and integrated tutorial through new page
commit 0f0093f2882489c3eeb6f8870f2b8aa64dc939a3
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 14:34:44 2014 -0700
more refactoring
commit 5a9b98e55ebd455ccf2c0ced20f984545a0b6d71
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:46:58 2014 -0700
clean js code
commit af3bbd8d5e1dffdaa1780f83b909ff566906e513
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:26:39 2014 -0700
level 1 cleanup
commit c4852a7766ab4fbd978d65c8352ace05eb427ef5
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:20:17 2014 -0700
fixed up fill-in level1
commit 7f02d80942549dec9c05f784b777fcb32d5bb81b
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Wed Oct 1 17:45:42 2014 -0700
added dockerfile tut, stylized lesson1 Questions
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: c257dcc9a4a78aa4455fbd417d0f80b2efb4713a
Component: engine
2014-10-08 13:46:44 -07:00
34b246475b
merged conflicting commits
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 8ceb213b3e86973c795ec87a724c7dc7a794d57e
Component: engine
2014-10-08 13:44:21 -07:00
a61100d91a
Fixes re-creating volume on (re)start
...
When a container is restarted all the volume configs are parsed again.
Even if the volume was already handled in a previous start it was still
calling "FindOrCreateVolume" on the volume repo causing a new volume to
be created.
This wasn't being detected because as part of the mount initialization
it checks to see if the the _mount_ was already initialized, but this
happens after the parsing of the configs.
So a check is added during parsing to skip a volume which was already
created for that container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c985302c5c2fb6d922acf29106b550cb36faaab6
Component: engine
2014-10-08 16:25:51 -04:00
153b47b46a
Restore volume refs after daemon restart
...
Volume refs were not being restored on daemon restart.
This made it possible to remove a volume being used by other containers
after a daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9acf7c765c7e074f6c75eaf162ca06ecfe40d692
Component: engine
2014-10-08 14:17:27 -04:00
3b41fdc9e8
pass extra file to child process as status handler
...
When stdout/stderr is closed prematurely, the proxy's writes to stdout/stderr
(i.e. `log.Errorf/log.Printf`) will returns with EPIPE error, and go runtime
will terminate the proxy when stdout/stderr writes trigger 10 EPIPE errors.
instead of using stdout/stderr as the status handler, we pass an extra file to
the child process and write `0\n` or `1\nerror message` to it and close it
after. This allow the child process to handle stdout/stderr as normal.
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 3b9d88210e763bebdfd7badb6ed3fd507d0f6513
Component: engine
2014-10-08 12:53:43 -04:00
f823d93515
docs: Remove Detach parameter from Exec Create example
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 2fd0e8eb5f062bd549f961122d172ecdf1ae085e
Component: engine
2014-10-08 10:31:12 -03:00
b7f1d56490
Fix Tag Test for longer tags
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: de32f48e6668e9f071272d588cf6acdd7090b9ca
Component: engine
2014-10-07 19:37:08 -07:00
4ed325655c
Merge pull request #8447 from burke/bump-tag-char-limit
...
Increase the tag length limit from 30 to 128
Upstream-commit: 60908acff6753a9a74cef011ca53d720997f019a
Component: engine
2014-10-07 18:31:35 -07:00
33d0e956f0
Add a best practice to reduce cache invalidations
...
inspired by https://github.com/docker-training/docker-fundamentals/pull/206
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a36ba19ccad8ea551a912ce16921af89d9e59012
Component: engine
2014-10-08 11:26:48 +10:00
0369c01385
Merge pull request #8431 from aluzzardi/b-alloc-network-error-handling
...
Container#AllocateNetwork: Simplify error handling.
Upstream-commit: 7f22fc32d53daa24d55b1b761e03f756917b5443
Component: engine
2014-10-07 18:21:28 -07:00
3c1879f50c
Merge pull request #8437 from SvenDowideit/un-pto-sven-oct-2014
...
back from camping, and making fred the docs 'guy in charge'
Upstream-commit: c2428ff8653cba5bb3aef4ace7066fa6fdb916b0
Component: engine
2014-10-07 20:01:26 -04:00
7d1d3484cd
Merge pull request #8459 from crosbymichael/entrypoint-parent
...
Allow child to overwrite entrypoint from parent
Upstream-commit: 989e064d6e1d359aa2f9f5eb917c5a5467401dff
Component: engine
2014-10-07 16:57:44 -07:00
5e5d8e4584
Merge pull request #8451 from eparis/systemd
...
Fix system socket/service unit files
Upstream-commit: 85da74ce5fe90e7662137b931f90015398bddc20
Component: engine
2014-10-07 16:54:20 -07:00
4b817432e5
Test for check /etc/resolv.conf on every docker run for 127.* content.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: acd511786e5d9d2aa440f4265ed8d4dda149d1cc
Component: engine
2014-10-07 16:51:51 -07:00
2d4da4a816
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 50fa9dffcf023c81f3142f0ddd294db4ac6b8281
Component: engine
2014-10-07 23:45:35 +00:00
