docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,420 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

9420 Commits

Author SHA1 Message Date
Victor Vieux 31f0cc04ec Merge pull request #6936 from vieux/merge_release_v1.1.1 
Merge release v1.1.1
 2014-07-09 13:31:11 -07:00
Victor Vieux b95fbe2d3f Change version to 1.1.1-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-09 19:24:11 +00:00
Victor Vieux 3afb89da48 Merge remote-tracking branch 'origin/release' 
Conflicts:
	VERSION
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-09 19:23:53 +00:00
Victor Vieux ecd20a96df Merge pull request #6915 from vieux/bump_v1.1.1 
Bump v1.1.1
 2014-07-09 12:16:22 -07:00
Tibor Vass aec8d90462 Merge pull request #6926 from LK4D4/log_for_tar_test 
Simple additions to TestBuildAddTar
 2014-07-09 11:40:55 -04:00
Tianon Gravi 65a5dde38b Merge pull request #6916 from vieux/update_release_checklist_hotfix 
Add hotfix help to the release checklist
 2014-07-09 07:50:38 -06:00
Alexandr Morozov fc2631b499 Simple additions to TestBuildAddTar 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-09 13:41:57 +04:00
Solomon Hykes 2d34a08c48 Merge pull request #6570 from cpuguy83/add_cpuguy83_as_volumes_maintainer 
Add cpuguy83 as volumes maintainer
 2014-07-09 02:12:14 -07:00
Victor Vieux 463435827b Merge pull request #9 from tianon/vieux-hotfix-minor-nits 
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
 2014-07-09 00:57:03 -07:00
Tianon Gravi e1166861d2 Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-08 19:53:08 -06:00
Sven Dowideit 903c2af04e Merge pull request #6891 from rogaha/update_footer_version 
Update the footer version with Enterprise and Partners sections
 2014-07-09 01:51:22 +00:00
Victor Vieux dc62f3cdcc Bump version to v1.1.1 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-09 00:59:54 +00:00
Michael Crosby f91a97256b Merge pull request #6773 from fabiofalci/restart_tests_to_cli 
Move `docker restart` tests to integration cli
 2014-07-08 17:44:29 -07:00
James Turnbull 037a869919 Merge pull request #6835 from OddBloke/master 
Explain ADD invalidation more accurately
 2014-07-08 20:41:59 -04:00
Fred Lifton 4898267988 Merge pull request #6567 from JasonGiedymin/add-h3 
Add H3 menu entries for leftnav
 2014-07-08 17:38:10 -07:00
Michael Crosby ca9d57245c Merge pull request #6921 from jamtur01/parsego 
Fixed some more styling issues with command line flags
 2014-07-08 17:34:09 -07:00
James Turnbull 2c9d055253 Merge pull request #6826 from fredlf/copyedit-builds 
Copyedit builds
 2014-07-08 20:31:04 -04:00
James Turnbull 2112c5e948 Fixed some more styling issues with command line flags 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-07-08 20:23:12 -04:00
Victor Vieux bdf7224941 Merge pull request #6918 from vieux/rebase_events_leak 
Rebase events leak
 2014-07-08 17:18:09 -07:00
Michael Crosby a613ac1907 Merge pull request #6270 from kung-foo/5418-underscore 
Replace dashes in link name with underscores
 2014-07-08 17:09:27 -07:00
Sam Rijs 560eb07009 avoid regression in events test 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
 2014-07-09 00:09:03 +00:00
Sam Reis 46747963b6 Add test for event limitation 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
 2014-07-09 00:09:03 +00:00
Sam Reis 5d4986c755 Fix server leaking events 
Solves #6843.

Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
 2014-07-09 00:08:36 +00:00
Fred Lifton 27c34f3eb9 Initial copy edits to builds.md 
Revised to match new UI, fixed links, copy edits and improvements.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

More revisions to builds.md

Corrections to automated build process, copy edits.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Edits based on Sonat's feedback

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-08 17:01:41 -07:00
Michael Crosby f021cd64ed Merge pull request #6636 from saaadhu/master 
Fix typo in README.md
 2014-07-08 16:35:26 -07:00
Victor Vieux 751c7e0f00 add hotfix help 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-08 23:25:26 +00:00
Michael Crosby f0aba1aad4 Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events 
Add event logs for pause/unpause
 2014-07-08 15:31:23 -07:00
Tibor Vass 699556e661 Tests for ADD tar 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

Conflicts:
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: vieux)
 2014-07-08 21:32:18 +00:00
Michael Crosby 94c27842d8 Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets." 
This reverts commit 1c8d3106df.

Conflicts:
	archive/archive_test.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
 2014-07-08 21:31:11 +00:00
Michael Crosby 44456ba065 Revert "allow overwrite in untar" 
This reverts commit 5a3d774e56.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
 2014-07-08 21:30:52 +00:00
unclejack 50c33ee877 Merge pull request #6911 from crosbymichael/revert-archive 
Revert archive changes around creating
 2014-07-09 00:08:25 +03:00
Michael Crosby f2a5b1fc37 Merge pull request #26 from tiborvass/fix-add-tar-test 
Tests for ADD tar
 2014-07-08 12:41:48 -07:00
Tibor Vass cfa4999d69 Tests for ADD tar 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-08 15:34:04 -04:00
Brian Goff e1ec91fc58 Add event logs for pause/unpuase 
Fixes #6856

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-07-08 15:27:44 -04:00
Michael Crosby 4b1a464ac1 Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets." 
This reverts commit 1c8d3106df.

Conflicts:
	archive/archive_test.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-07-08 12:26:59 -07:00
Michael Crosby 10d066c9cb Revert "allow overwrite in untar" 
This reverts commit 5a3d774e56.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-07-08 12:23:08 -07:00
James Turnbull 446ceee51e Merge pull request #6865 from SvenDowideit/remove-the-named-container-before-creating-a-new-one 
Don't make the user get a container already exists error
 2014-07-08 14:42:17 -04:00
Tianon Gravi f014236791 Merge pull request #6897 from tianon/moar-squeeze-lts 
Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
 2014-07-08 07:57:53 -06:00
James Turnbull 0327b0f4af Merge pull request #6899 from sjp38/patch-1 
understanding-docker: Use consistent term
 2014-07-08 08:41:20 -04:00
SeongJae Park 14ffde2d8c understanding-docker: Use consistent term 
Term 'service' was used together with 'daemon'. It would be better to use the term 'daemon' solely because most part of documentation are using the term.
 2014-07-08 14:50:57 +09:00
Solomon Hykes 55915b8e00 Merge pull request #6760 from jamtur01/contrib 
Minor updates and fixes to the CONTRIBUTING doc
 2014-07-07 18:42:29 -07:00
SvenDowideit 6a9c6d3bf1 Don't make the user get a container alreayd exists error 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-08 11:09:55 +10:00
Michael Crosby 42a28f79dc Merge pull request #6849 from leeplay/patch-1 
Update README.md
 2014-07-07 16:43:57 -07:00
Sven Dowideit fbafa8038d Merge pull request #6858 from timthelion/patch-6 
We haven't required lxc and aufs for years now...
 2014-07-08 09:37:53 +10:00
Sven Dowideit 0284e5dfea Merge pull request #6871 from prosto-chewey/patch-1 
Update running_riak_service.md
 2014-07-08 09:35:01 +10:00
Sven Dowideit d20367c216 Merge pull request #6870 from andreaturli/doc/jclouds-client 
add jclouds-docker client reference
 2014-07-08 09:29:27 +10:00
Tianon Gravi a6f1995550 Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well 
Note that the archive does _not_ have a symlink from oldstable-lts to squeeze-lts, hence the change from using "${suite}" to not using it in here and just using the string "squeeze-lts" directly regardless of whether we're building a "squeeze" image or an "oldstable" image.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-07 17:14:31 -06:00
Roberto Gandolfo Hashioka fd66e77465 Update the footer version with Enterprise and Partners sections 
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
 2014-07-07 16:02:15 -07:00
Tianon Gravi 77ed01c8da Merge pull request #6886 from tianon/no-binddir-if-docker_host 
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
 2014-07-07 17:00:03 -06:00
Victor Vieux 170609e369 Merge pull request #6720 from fabiofalci/relax_dns_search 
Relax dns search to accept empty domain
 2014-07-07 15:12:29 -07:00