Solomon Hykes
a1789a2eab
Merge pull request #9032 from fredlf/revise-docs-maintainers
...
Revise Docs Maintainers list
2014-11-10 17:11:25 -08:00
Sven Dowideit
970e404e9b
Merge pull request #9069 from cpuguy83/docs_for_pr8509
...
Add missing docs for #8509
2014-11-10 17:04:28 -08:00
Michael Crosby
84f25414c1
Merge pull request #9014 from LK4D4/fix_parent_failing
...
Not fail on updating parent links
2014-11-10 12:53:16 -08:00
Jessie Frazelle
4fcd3dd748
Merge pull request #8716 from duglin/Issue8331
...
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
2014-11-10 13:03:57 -07:00
Alexandr Morozov
3c5155ac16
Merge pull request #9028 from unclejack/add_yeong-sil_jang
...
pkg/namesgenerator: add Yeong-Sil Jang
2014-11-10 10:07:27 -08:00
Brian Goff
271f54aea3
Add missing docs for #8509
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-10 12:25:17 -05:00
Arnaud Porterie
0f21d9aea7
Merge pull request #6810 from phemmer/4442-hairpin-nat
...
Support hairpin NAT
2014-11-10 08:53:01 -08:00
James Turnbull
e4fe85fc95
Merge pull request #9052 from andreyst/master
...
Fix typo in Docker Links chapter of User Guide
2014-11-10 00:10:38 -05:00
James Turnbull
1e75c9e8b4
Merge pull request #9057 from andi5/typo-best-practices
...
Fix mkdir typo in dockerfile_best-practices.md.
2014-11-10 00:10:20 -05:00
James Turnbull
2d30473927
Merge pull request #9029 from ovh/fix/doc
...
Fix Docker Hub tags list specification
2014-11-10 00:05:34 -05:00
Andreas Köhler
b95f9c10ff
Fix mkdir typo in dockerfile_best-practices.md.
2014-11-10 01:00:05 +01:00
Andrey Stolbovsky
932cc23081
Fix typo in Docker Links chapter of User Guide
2014-11-09 23:23:45 +03:00
unclejack
ef150d023a
pkg/namesgenerator: add Yeong-Sil Jang
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-08 16:36:41 +02:00
unclejack
b18efeeb7a
Merge pull request #9023 from cyphar/libcontainer-update-to-new-interface
...
Update vendor'd `libcontainer` and update to use new `user` interface.
2014-11-08 16:17:28 +02:00
Aleksa Sarai
3ac4aa0d6b
*: transition to new libcontainer/user API
...
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-11-08 10:03:12 +11:00
Aleksa Sarai
a10cca257f
vendor: update vendor'd libcontainer version
...
This patch updates the vendor'd libcontainer version, so that Docker can
take advantage of the updates to the `user` API.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-11-08 09:57:20 +11:00
Doug Davis
2e482c86bc
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
...
Closes #8331
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-07 13:58:05 -08:00
Fred Lifton
480b5e9c62
Revise Docs Maintainers list
...
Removing Sonat from docs maintainers because he no longer has time to complete all the responsibilities. Many thanks to Sonat for his help.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-11-07 13:13:01 -08:00
Alexandr Morozov
349f67632f
Merge pull request #8931 from vbatts/vbatts-mount_pid_mountinfo
...
pkg/mount: mountinfo from specified pid
2014-11-07 12:04:52 -08:00
Vincent Batts
64e7a1722d
pkg/mount: mountinfo from specified pid
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-07 13:37:23 -05:00
Vincent Giersch
c30ccc62e4
Fix Docker Hub tags list specification
...
The current implementation of the Docker Hub returns a list of objects
containing the tag name and the layer id.
Docker-DCO-1.1-Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2014-11-07 17:16:42 +01:00
Alexandr Morozov
b83fc07d88
Not fail on updating parent links
...
Fixes #8796
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-06 15:30:23 -08:00
Fred Lifton
3afe9dbd24
Merge pull request #8970 from georgexsh/hyphen
...
unify `–`(en dash) to `-` when specifying options
2014-11-06 14:48:48 -08:00
Alexandr Morozov
734419e9c7
Merge pull request #8711 from duglin/Issue8160
...
Add import/pull events to the stream
2014-11-06 14:29:02 -08:00
Doug Davis
ef7415258b
Add import/pull events to the stream
...
Closes #8160
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-06 12:12:41 -08:00
Michael Crosby
dd62d256cb
Merge pull request #8963 from blakery/master
...
Cleanup: made GetDefaultNetworkMtu private
2014-11-06 12:02:18 -08:00
Michael Crosby
546884fd20
Merge pull request #8977 from LK4D4/vet_fixes
...
Fix vet errors
2014-11-06 11:59:05 -08:00
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
Alexandr Morozov
18d9f1978b
Fix vet errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-05 08:26:22 -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
Blake Geno
cbb88741e4
Removed fixme from utils_test.go
...
Signed-off-by: Blake Geno <blakegeno@gmail.com>
2014-11-05 08:36:08 -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