Michael Crosby
6a6be5bd5a
Merge pull request #8983 from LK4D4/consistent_hosts
...
Consistent hosts
2014-11-06 11:51:28 -08:00
Alexandr Morozov
048d0c4e84
Test for etchosts consistency
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-06 11:36:09 -08:00
Alexandr Morozov
6cbe1fa726
Make /etc/hosts records consistent
...
Fixes #8972
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-06 11:36:00 -08:00
Michael Crosby
55f9b0c874
Merge pull request #9005 from vbatts/vbatts-devmapper_add_maintainer
...
devmapper: add vbatts to MAINTAINERS
2014-11-06 11:26:40 -08:00
Vincent Batts
2fbfa29318
devmapper: add vbatts to MAINTAINERS
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-06 14:06:52 -05:00
Michael Crosby
68a25a5b74
Merge pull request #8988 from crosbymichael/update-libcontainer-nov1
...
Update libcontainer to fd6df76562137aa3b18e44b790c
2014-11-06 11:02:29 -08:00
Jessie Frazelle
a72f3c568b
Merge pull request #8990 from duglin/Issue8379a
...
Make sure that if a container can't start we set the exitcode to non-zero value
2014-11-06 10:44:10 -08:00
Alexandr Morozov
ff911d5f34
Merge pull request #8998 from yoheiueda/dont-remove-tmpdir
...
Fix the unit test not to remove /tmp
2014-11-06 08:59:02 -08:00
Yohei Ueda
2329354dc3
Fix the unit test not to remove /tmp
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
2014-11-07 02:43:59 +09:00
Tianon Gravi
b35a0ba81b
Merge pull request #8974 from unclejack/bump_fpm
...
bump fpm to 1.3.2
2014-11-06 09:37:25 -07:00
Jessie Frazelle
6fcc9141d7
Merge pull request #8953 from golubbe/master
...
Create governance doc and show links to DGAB materials in google doc
2014-11-05 22:13:05 -08:00
Doug Davis
69a5b827dc
See #8379 - if the container doesn't start I added code to make sure that if no other processing sets the container.exitCode to a non-zero value when we make sure its done before we return. I also made sure that while trying to start the CMD/ENTRYPOINT, if it fails, then we set the container.exitCode to the exitStatus from the exec().
...
Closes #8379
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-05 18:23:42 -08:00
Michael Crosby
ed556fb38f
Update docker with syncpipe changes
...
We removed the syncpipe package and replaced it with specific calls to
create a new *os.File from a specified fd passed to the process. This
reduced code and an extra object to manage the container's init
lifecycle.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-06 01:14:13 +00:00
Michael Crosby
7f5ebdcaac
Update libcontainer to fd6df76562137aa3b18e44b790c
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-06 01:12:41 +00:00
Sven Dowideit
56261daf32
Merge pull request #8683 from cpuguy83/fix_api_docs
...
Bring API docs inline with 1.3
2014-11-05 16:34:27 -08:00
Erik Hollensbe
a733afb256
Merge pull request #8987 from erikh/exec_stdin_close
...
Close stdin after execution with `docker exec -i`
2014-11-05 15:42:05 -08:00
Erik Hollensbe
165624062e
Close stdin after execution with docker exec -i
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-11-05 15:12:24 -08:00
golubbe
d453d8b321
Create GOVERNANCE.md
...
Information on Governance Advisory Board and associated proposals
Signed-off-by: Ben Golub <ben.golub@docker.com>
2014-11-05 21:48:17 +00:00
Fred Lifton
f10fefe408
Merge pull request #8874 from whoshuu/patch-1
...
Fix apparent copy paste mistake
2014-11-05 12:24:53 -08:00
Brian Goff
e86223e7b3
Bring API docs inline with 1.3
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-05 09:38:44 -05:00
James Turnbull
a61c4dc959
Merge pull request #8876 from whoshuu/docpatch-2
...
Remove out-of-context code block
2014-11-05 10:52:50 +01:00
unclejack
03f67aa46a
bump fpm to 1.3.2
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-05 10:12:57 +02:00
unclejack
662efd95c7
Merge pull request #8577 from vbatts/vbatts-registry_certs
...
registry: don't iterate through certs
2014-11-05 09:46:24 +02:00
James Turnbull
387c892126
Merge pull request #8915 from gDD/patch-1
...
Remove extra line feed typo
2014-11-05 08:22:09 +01:00
James Turnbull
49ecc499d7
Merge pull request #8908 from medimatrix/patch-1
...
Grammatical mistake in docs
2014-11-05 08:21:00 +01:00
Sven Dowideit
0d513b5a84
Merge pull request #8900 from nhsiehgit/updatefooter
...
Updatefooter
2014-11-04 17:14:58 -08:00
Tibor Vass
b79211f4ae
Merge pull request #8345 from duglin/Issue5184
...
Add a better error message when we get an unknown http issue
2014-11-04 20:07:41 -05:00
Doug Davis
6fdaa66652
Add a better error message when we get an unknown http issue
...
Closes #5184
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-04 16:46:41 -08:00
Sven Dowideit
098ccba6bd
Merge pull request #8892 from fredlf/relnotes-edit
...
Edits and refinements to 1.3.1 release notes.
2014-11-04 16:43:07 -08:00
Nathan Hsieh
ebeccee968
Updated footer to match rest of site
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
2014-11-04 15:28:38 -08:00
Tianon Gravi
c478143ec0
Merge pull request #8404 from danjpgriffin/master
...
Preserve extended attributes and acls on archlinux build
2014-11-04 14:14:10 -07:00
Vincent Batts
a368e064a9
registry: don't iterate through certs
...
the golang tls.Conn does a fine job of that.
http://golang.org/src/pkg/crypto/tls/handshake_client.go?#L334
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-04 16:12:23 -05:00
Tianon Gravi
14e65b4f81
Merge pull request #8936 from jfrazelle/drone-server
...
Switch Travis for Drone
2014-11-04 11:18:39 -07:00
Tianon Gravi
c6cf978b4b
Merge pull request #8700 from unclejack/install_no_pull
...
contrib/install.sh: remove pull of hello-world
2014-11-04 10:28:43 -07:00
Solomon Hykes
59d4161f69
Merge pull request #8950 from Bertg/patch-1
...
makes the -s --size option documentation clearer
2014-11-04 09:09:15 -08:00
unclejack
f9d80712d9
contrib/install.sh: remove pull of hello-world
...
This removes the pull of the hello-world image from install.sh to
address privacy concerns.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 19:05:47 +02:00
Alexandr Morozov
b8678aa7f5
Merge pull request #8946 from unclejack/stream_decode
...
Decode JSON to avoid ReadFile
2014-11-04 09:02:40 -08:00
Bert Goethals
762ffda95d
makes the -s --size option documentation clearer
2014-11-04 17:49:39 +01:00
Jessie Frazelle
a34f31b488
Merge pull request #8871 from tonistiigi/start-wait-hijack
...
Wait for hijack on docker start command
2014-11-04 08:46:56 -08:00
Tibor Vass
fa59fe997c
Merge pull request #8877 from erikh/proxy_error_check
...
proxy: Fix a potential panic handling error states.
2014-11-04 11:40:02 -05:00
Tibor Vass
6718791ea2
Merge pull request #8813 from jlhawn/aufs_exclude_on_tar_layer
...
Exclude `.wh..wh.*` AUFS metadata on layer export
2014-11-04 11:38:12 -05:00
Arnaud Porterie
edae8830a9
Merge pull request #8906 from dqminh/remove-copy-directory
...
change util.CopyDirectory to archive.CopyWithTar
2014-11-04 08:02:35 -08:00
Alexandr Morozov
9eb8fcd58a
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
2014-11-04 07:54:59 -08:00
Malte Janduda
28605bc4d5
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2014-11-04 15:19:47 +01:00
unclejack
f665be55fe
volume: stream JSON & Decode
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:15:07 +02:00
unclejack
4dbbe4f51a
image: stream img JSON & Decode in LoadImage
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:15:00 +02:00
unclejack
4bc28f4e6b
daemon/container: stream & decode JSON
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-04 16:14:47 +02:00
Sven Dowideit
b68d7d39bc
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
2014-11-03 23:09:16 -08:00
Tibor Vass
5b03a21963
Merge pull request #8799 from jlhawn/remove_jsondata_arg
...
Remove `jsonData` argument from `image.StoreImage`
2014-11-03 20:55:40 -05:00
Jessica Frazelle
4b4b88a873
Switch travis status to drone.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-03 17:48:50 -08:00