8f763a09d3
Merge pull request #9143 from coolljt0725/cleanup_defaulttag
...
Cleanup:change "latest" to graph.DEFAULTTAG
2014-11-13 09:00:00 -08:00
3c3968692d
Cleanup:change latest to graph.DEFAULTTAG
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-11-13 16:21:34 +08:00
42861f3b45
Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings
...
devicemapper: split out devicemapper bindings
2014-11-12 19:59:36 -05:00
9670871e01
Merge pull request #8982 from rhvgoyal/save-restore-device-id
...
Save restore device Id: issue #8978
2014-11-12 15:41:27 -08:00
e12572f265
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
2014-11-12 15:37:34 -08:00
33382385c3
Merge pull request #9124 from erikh/secure-localhost
...
Secure localhost registry (carry of #8898 )
2014-11-12 15:25:15 -08:00
2e27263aac
Merge pull request #9127 from vishh/maintainer
...
Adding Vish as a maintainer for daemon.
2014-11-12 15:02:17 -08:00
06bf79552d
Adding Vish as a maintainer for daemon code.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-11-12 22:55:32 +00:00
3ef2fc7f0f
Merge pull request #9105 from stevenburgess/archiveCommentFix
...
Fix comment to match the arg name
2014-11-12 14:52:27 -08:00
08f5edce30
Merge pull request #8479 from vishh/OOM
...
Provide Out Of Memory information in container status
2014-11-12 14:15:29 -08:00
11380a109e
registry: always treat 127.0.0.1 as insecure for all cases anytime anywhere
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-11-12 12:14:43 -08:00
28ee373e19
registry: default --insecure-registry to localhost and 127.0.0.1
...
Signed-off-by: Johan Euphrosine <proppy@google.com>
2014-11-12 09:12:42 -08:00
15c74bebc1
devmapper: Take care of some review comments
...
Took care of some review comments from crosbymichael.
v2:
- Return "err = nil" if file deviceset-metadata file does not exist.
- Use json.Decoder() interface for loading deviceset metadata.
v3:
- Reverted back to json marshal interface in loadDeviceSetMetaData().
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2014-11-12 09:36:32 -05:00
6ad1cd5d0f
Merge pull request #9102 from brahmaroutu/add_tag_9001
...
improve error message to print the tag
2014-11-12 02:37:40 -07:00
1396cff375
Merge pull request #9079 from SvenDowideit/pr_out_update_roadmap_md_based_on_10_21_2014_dgab_meeting
...
Update ROADMAP.md based on 10/21/2014 DGAB meeting
2014-11-11 23:00:25 -08:00
492c4fc1a8
Merge pull request #9106 from duglin/TyposRemoteAPI
...
Add missing comma in docs
2014-11-11 22:48:30 -05:00
814bc06d7b
Add missing comma in docs
...
Found by Michael Voznesensky <voznesenskym@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-11 15:18:20 -08:00
64a335ceac
Fix comment to match the arg name
...
Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com>
2014-11-11 18:01:08 -05:00
e546c8cc1d
Merge pull request #9041 from unclejack/lxc_maintainers_comment
...
execdriver/lxc: add comment to MAINTAINERS
2014-11-12 00:27:11 +02:00
bc45428220
improve error message to print the tag
...
Closes #9001
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-11-11 22:18:40 +00:00
e08d1f6af2
Merge pull request #9095 from proppy/is-secure-test
...
registry: add tests for IsSecure
2014-11-11 16:52:36 -05:00
75e3b35bf1
registry: add tests for IsSecure
...
Signed-off-by: Johan Euphrosine <proppy@google.com>
2014-11-11 11:02:32 -08:00
c0499494df
Merge pull request #9090 from unclejack/archive_interface
...
pkg/archive: add interface for Untar
2014-11-11 20:57:58 +02:00
d6a4d045f7
Merge pull request #8840 from decadent/fix-da-copy-directive-reference
...
Nuh uh... quoth the build log: Source can't be a URL for COPY
2014-11-11 10:57:00 -08:00
9e0fac3da8
Merge pull request #9082 from SvenDowideit/pr_out_add_some_details_about_the_lifecycle_of_commands_started_with_docker_exec
...
Add some details about the lifecycle of commands started with docker exec
2014-11-11 10:55:12 -08:00
a131032422
Merge pull request #9091 from duglin/CleanupIntTests
...
Cleanup some integration-cli output
2014-11-11 10:56:29 -07:00
0cef21cfba
Cleanup some integration-cli output
...
I noticed a few things that were bugging me in the output
of the integration-cli tests.
- one of the tests used println to stdout so we had garage sent to the screen
- some of the test, in their final log message, didn't include the name of
the group/file e.g. daemon - run,iptables was just run,iptables
And yes, I noticed this because I'm anal :-) but also because we should keep
the output of the tests as clean as possible so its easy to spot it when
things go bad.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-11 08:44:32 -08:00
14692d0d41
pkg/archive: add interface for Untar
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-11 18:28:33 +02:00
2a517fe103
Merge pull request #8726 from krallin/failed-start-breaks-volumes-from
...
Fix: a failed Start() breaks --volumes-from on subsequent Start()'s
2014-11-11 10:49:33 -05:00
2ff203f0a6
Merge pull request #9071 from fredlf/add-docs-readme
...
Add link to Docs README.
2014-11-11 07:25:09 -05:00
447387474a
Add some details about the lifecycle of commands started with docker exec
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-11-11 15:56:27 +10:00
0b4132782a
Merge pull request #9048 from coaku/b_xzk_rm_redundant_trim
...
Remove redundant stripComment
2014-11-10 21:53:22 -08:00
703ef3caa8
Merge pull request #9050 from prasincs/patch-1
...
Additional info for docker binary
2014-11-10 20:22:05 -08:00
ca0885729d
Fix 80 char. error
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-11-10 17:50:12 -08:00
d94de133f4
Update ROADMAP.md based on 10/21/2014 DGAB meeting
...
The Docker Governance Advisory Board (DGAB) met for the first time Tue 10/21/2014.
Among other topics, the DGAB reviewed and refreshed the Docker Project Statement of Direction.
(Sven added from the Pull Req #9055 )
Docker-DCO-1.1-Signed-off-by: Scott Johnston <scott.johnston@docker.com> (github: j0hnst0n)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-11-11 11:43:37 +10:00
67c7faa002
Merge pull request #9065 from tobegit3hub/master
...
Remove the redundant include_search in mkdocs.yml
2014-11-10 17:24:07 -08:00
a1789a2eab
Merge pull request #9032 from fredlf/revise-docs-maintainers
...
Revise Docs Maintainers list
2014-11-10 17:11:25 -08:00
48424df685
properly line wrapping
...
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>
2014-11-10 20:06:22 -05:00
970e404e9b
Merge pull request #9069 from cpuguy83/docs_for_pr8509
...
Add missing docs for #8509
2014-11-10 17:04:28 -08:00
cf19df4683
fixing punctuation and grammar
...
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>
2014-11-10 18:05:02 -05:00
dacae746b7
Cleanup api server creation
...
Current implementation is hard to reason about because of trying to mix
unix/tcp server implementations, even though they are quite different.
This cleans that up.
Also makes it possible to create and manage a new API server easily,
e.g. for adding an introspection socket to a container.
Built in such a way as to allow a non-HTTP server to work as well, such
as libchan.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-10 16:20:35 -05:00
84f25414c1
Merge pull request #9014 from LK4D4/fix_parent_failing
...
Not fail on updating parent links
2014-11-10 12:53:16 -08:00
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
67ca7415e7
Add link to Docs README.
...
Linking to the docs readme to help would-be contributors discover the style guide and docs contribution guidelines.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-11-10 11:33:16 -08:00
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
271f54aea3
Add missing docs for #8509
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-10 12:25:17 -05:00
0f21d9aea7
Merge pull request #6810 from phemmer/4442-hairpin-nat
...
Support hairpin NAT
2014-11-10 08:53:01 -08:00
fb62e18441
Fix: Failed Start breaks VolumesFrom
...
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).
Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.
The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.
Fixes : #8726
Signed-off-by: Thomas Orozco <thomas@orozco.fr>
2014-11-10 17:32:16 +01:00
b92d7cd60d
Remove the redundant include_search in mkdocs.yml
2014-11-10 20:23:46 +08:00
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
Alexandr Morozov
Lei Jitang
Vincent Batts
Michael Crosby
Erik Hollensbe
Solomon Hykes
Vishnu Kannan
Johan Euphrosine
Vivek Goyal
Jessie Frazelle
James Turnbull
Doug Davis
Steven Burgess
unclejack
Srini Brahmaroutu
Tibor Vass
Fred Lifton
unclejack
Sven Dowideit
Sven Dowideit
Scott Johnston
Prasanna Gautam
Brian Goff
Arnaud Porterie
Thomas Orozco
tobe