58d9480aa6
Update bash completion to only complete on directories as the argument to "docker build"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 91769117365207ad3218ee7bea6c472583b3ba2b
Component: engine
2014-07-08 20:26:23 -06:00
e17cfef1f0
Merge pull request #6891 from rogaha/update_footer_version
...
Update the footer version with Enterprise and Partners sections
Upstream-commit: 903c2af04e99dbfc4030cc875c470c972895f392
Component: engine
2014-07-09 01:51:22 +00:00
afb119eb53
Merge pull request #6773 from fabiofalci/restart_tests_to_cli
...
Move `docker restart` tests to integration cli
Upstream-commit: f91a97256b5773f889f9e2d7a1be53f90c3d0318
Component: engine
2014-07-08 17:44:29 -07:00
e3ec85f712
Merge pull request #6835 from OddBloke/master
...
Explain ADD invalidation more accurately
Upstream-commit: 037a869919a686cd18c7a5873842f523ff4b492e
Component: engine
2014-07-08 20:41:59 -04:00
19f873ca05
Merge pull request #6567 from JasonGiedymin/add-h3
...
Add H3 menu entries for leftnav
Upstream-commit: 489826798829f2fd17a36e11e5809b211f808bc6
Component: engine
2014-07-08 17:38:10 -07:00
852cc6a979
Merge pull request #6921 from jamtur01/parsego
...
Fixed some more styling issues with command line flags
Upstream-commit: ca9d57245c0289e90ed70818d7b669e2e8be5050
Component: engine
2014-07-08 17:34:09 -07:00
321e9b819d
Merge pull request #6826 from fredlf/copyedit-builds
...
Copyedit builds
Upstream-commit: 2c9d0552532e2981cd5ca1c5f38ba50c2b286679
Component: engine
2014-07-08 20:31:04 -04:00
bbc512f23b
Fixed some more styling issues with command line flags
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 2112c5e948d1ef3d3efb34875a97f01fde809143
Component: engine
2014-07-08 20:23:12 -04:00
d0b563d37b
Merge pull request #6918 from vieux/rebase_events_leak
...
Rebase events leak
Upstream-commit: bdf72249418ab6dea8921d57e809ca4603be893d
Component: engine
2014-07-08 17:18:09 -07:00
c5b657327a
Merge pull request #6270 from kung-foo/5418-underscore
...
Replace dashes in link name with underscores
Upstream-commit: a613ac19074dcafa54d254c7ce70ec65de9702bc
Component: engine
2014-07-08 17:09:27 -07:00
4eb22040d9
avoid regression in events test
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 560eb07009d65fbcfb49b2fa8b04a2e3f4d647e8
Component: engine
2014-07-09 00:09:03 +00:00
bbaf2a8ed6
Add test for event limitation
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 46747963b603a5573a0b26dcef407a96757926e7
Component: engine
2014-07-09 00:09:03 +00:00
13e7613ad0
Fix server leaking events
...
Solves #6843 .
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 5d4986c755526ad5d249ba96eb6213ce089a9c25
Component: engine
2014-07-09 00:08:36 +00:00
f3b4015ccd
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)
Upstream-commit: 27c34f3eb93ee58d585f8b792659dc2c0464bd0d
Component: engine
2014-07-08 17:01:41 -07:00
bfe0fa53e6
Merge pull request #6636 from saaadhu/master
...
Fix typo in README.md
Upstream-commit: f021cd64eda967f7e5a4b3a3f5c99fb7efe49c10
Component: engine
2014-07-08 16:35:26 -07:00
a8bb2012bc
Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events
...
Add event logs for pause/unpause
Upstream-commit: f0aba1aad4d86c5f4989b40bd27be96d72eab6a2
Component: engine
2014-07-08 15:31:23 -07:00
83030ccbe7
Merge pull request #6911 from crosbymichael/revert-archive
...
Revert archive changes around creating
Upstream-commit: 50c33ee877ce1b395f2945809a03261df54e0d9b
Component: engine
2014-07-09 00:08:25 +03:00
b15853aeda
Merge pull request #26 from tiborvass/fix-add-tar-test
...
Tests for ADD tar
Upstream-commit: f2a5b1fc37a315cb36f0d8dd4f0bb462c926241a
Component: engine
2014-07-08 12:41:48 -07:00
ff37e700fc
Tests for ADD tar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: cfa4999d695d98f30d942460576d5f9c03a64d92
Component: engine
2014-07-08 15:34:04 -04:00
34644f5fc5
Add event logs for pause/unpuase
...
Fixes #6856
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: e1ec91fc582f10d57025e39f0f7e7d6695f7454e
Component: engine
2014-07-08 15:27:44 -04:00
c916fa43d0
Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets."
...
This reverts commit 1c8d3106df0bd2aba304c7b3863949ca11c2b133.
Conflicts:
archive/archive_test.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 4b1a464ac106b413fc773869adea9c89a08aee3a
Component: engine
2014-07-08 12:26:59 -07:00
eea97055fb
Revert "allow overwrite in untar"
...
This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 10d066c9cbc074a72ef3bb4f06a39b691a155082
Component: engine
2014-07-08 12:23:08 -07:00
3fadeb2381
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
Upstream-commit: 446ceee51ed1cde3a291c7d53ab3bd0c4a1573ea
Component: engine
2014-07-08 14:42:17 -04:00
833fba6657
Merge pull request #6897 from tianon/moar-squeeze-lts
...
Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
Upstream-commit: f014236791fa0078574d6c437b2c13749cf58e90
Component: engine
2014-07-08 07:57:53 -06:00
d96d4dd200
Merge pull request #6899 from sjp38/patch-1
...
understanding-docker: Use consistent term
Upstream-commit: 0327b0f4af24360ee6e078e39dcbcc22cf5dbc0b
Component: engine
2014-07-08 08:41:20 -04:00
7cc3436ee3
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.
Upstream-commit: 14ffde2d8c67065a24930e0ac0844099cbc2cfa8
Component: engine
2014-07-08 14:50:57 +09:00
852a32d096
Merge pull request #6760 from jamtur01/contrib
...
Minor updates and fixes to the CONTRIBUTING doc
Upstream-commit: 55915b8e002f4be52bfbf18ec7ea0a45f0c663b0
Component: engine
2014-07-07 18:42:29 -07:00
843b374f7e
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)
Upstream-commit: 6a9c6d3bf12982ca31e0b38cd323073b44c98456
Component: engine
2014-07-08 11:09:55 +10:00
4ee2474d5a
Merge pull request #6849 from leeplay/patch-1
...
Update README.md
Upstream-commit: 42a28f79dcbbf7b89069b016496359dc8d2ef62d
Component: engine
2014-07-07 16:43:57 -07:00
9638017be3
Merge pull request #6858 from timthelion/patch-6
...
We haven't required lxc and aufs for years now...
Upstream-commit: fbafa8038d9b56ed37e9846cec6bb956944793a6
Component: engine
2014-07-08 09:37:53 +10:00
4bbfd572e7
Merge pull request #6871 from prosto-chewey/patch-1
...
Update running_riak_service.md
Upstream-commit: 0284e5dfeaecd7e4103cfaa5c77cff1f4ffa1290
Component: engine
2014-07-08 09:35:01 +10:00
16bd2397f1
Merge pull request #6870 from andreaturli/doc/jclouds-client
...
add jclouds-docker client reference
Upstream-commit: d20367c2164e21035b105a9fe2edd30afc2d6b71
Component: engine
2014-07-08 09:29:27 +10:00
2e4164d0ba
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)
Upstream-commit: a6f19955506bd51ae5f6de57ff3ce7976fa7db27
Component: engine
2014-07-07 17:14:31 -06:00
c0012fb00a
Update the footer version with Enterprise and Partners sections
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
Upstream-commit: fd66e7746519ab32bf3f6f336052a4ff763e213b
Component: engine
2014-07-07 16:02:15 -07:00
ca239945ba
Merge pull request #6886 from tianon/no-binddir-if-docker_host
...
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
Upstream-commit: 77ed01c8da35dd8880c7b9663d10a585fa533710
Component: engine
2014-07-07 17:00:03 -06:00
75cb3255af
Merge pull request #6720 from fabiofalci/relax_dns_search
...
Relax dns search to accept empty domain
Upstream-commit: 170609e36957fc044723789bc66918bd7d189702
Component: engine
2014-07-07 15:12:29 -07:00
5a05ec9b94
Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
...
docker save: fix the 'repositories' file
Upstream-commit: 52c58b9ea09655fdcd143f94d733a91229dd557c
Component: engine
2014-07-07 17:26:52 -04:00
a4bc6c02a7
Merge pull request #6813 from gsalgado/convert-testgetimagesjson
...
Convert TestGetImagesJSON into several unit tests
Upstream-commit: f34510b1235bbe7f785e4cead7bfc97f4041bb6f
Component: engine
2014-07-07 13:40:38 -07:00
9f5fa2a3c1
Merge pull request #6829 from unclejack/update_archive_tar
...
update vendored archive/tar to lower the number of memory allocations
Upstream-commit: e7db0d4f44b3a4cd9b34776bc936f42fa417f9ea
Component: engine
2014-07-07 23:35:19 +03:00
f220709916
Convert TestGetImagesJSON into several unit tests
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 627805f5f8895c3a3887c312f7b8f49a89e51732
Component: engine
2014-07-07 21:55:26 +02:00
41890809ce
We haven't required lxc and aufs for years now...
...
Well, maybe not years, but internet years...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: ea583fda97617a349ef026dd2d99a0d5e4b0980d
Component: engine
2014-07-07 19:45:36 +00:00
ea789048c6
Merge pull request #6799 from LK4D4/refactor_portallocator
...
Refactoring portallocator
Upstream-commit: 3993f9d5818f344199c3b13ae8aa9e6bee22479e
Component: engine
2014-07-07 12:39:36 -07:00
6996bb64aa
Merge pull request #6821 from LK4D4/broadcast_writer_refactor
...
Broadcast writer refactor
Upstream-commit: bade039bda0ddff19b14db516ecb210f343243a2
Component: engine
2014-07-07 12:15:47 -07:00
b15cf92d6a
docker save: more integration tests
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 600f65b24786d15a382877da4c3ae77d88e252bb
Component: engine
2014-07-07 14:58:27 -04:00
1270978241
Merge pull request #6850 from leeplay/patch-2
...
Update README.md
Upstream-commit: 578513095c1f69227d7942d167fc41b6598d95ac
Component: engine
2014-07-07 11:50:27 -07:00
df92ffe131
Merge pull request #6702 from mrunalp/dev/helper_fns
...
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
2014-07-07 11:39:27 -07:00
bdbe2e1a2a
Merge pull request #6452 from mheon/selinux_btrfs_fix
...
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
Upstream-commit: 219a3345deade869a415436c2b5c24c0c523ca08
Component: engine
2014-07-07 11:34:50 -07:00
efbfc9bcff
Merge pull request #6645 from snitm/dmthinp-devel
...
Dmthinp devel
Upstream-commit: 2e4f99d99c34edaba2d37270545af2b8fd753dab
Component: engine
2014-07-07 21:20:31 +03:00
5a10cf09e4
Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
...
Moved last build tests to integration-cli
Upstream-commit: 880c98d2d3500a5b694eb4e3a610b6aedf1fa493
Component: engine
2014-07-07 10:53:26 -07:00
111401852c
Merge pull request #6508 from mheon/signals
...
Increase size of buffer for signal forwarding with --sig-proxy
Upstream-commit: 860c664ccbe1fd680be3952034126d82ce73a064
Component: engine
2014-07-07 10:45:31 -07:00
