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
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
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
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
6a68c558b1
Merge pull request #6371 from jpetazzo/6370-masquerade
...
Select masquerade by outgoing interface rather than by destination subne...
Upstream-commit: bcec0f30e8d7dbb9fcdd6a85fa4b8e4953ba66ff
Component: engine
2014-07-07 10:28:31 -07:00
35129fcf06
Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
...
add client OS and arch to docker version
Upstream-commit: dd89904ad3ad8147fb046db0e5fef9f6379f9a39
Component: engine
2014-07-07 10:15:30 -07:00
d1bf2949a1
Merge pull request #6823 from folieadrien/move_integration_tests
...
Convert TestGetImagesByName into unit and integration-cli test
Upstream-commit: 4a20c9b005362ffdaa6b1b71adab1063191cf9f5
Component: engine
2014-07-07 10:13:19 -07:00
3c148b5823
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
...
If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c2653b0a9ed4b371342fc2019c56d9433197171e
Component: engine
2014-07-07 10:54:03 -06:00
7655d4fdd1
Merge pull request #6884 from tianon/use-docker-based-travis
...
Update Travis to use pretty Docker-based workers
Upstream-commit: de07654c60d74efac10f14ff01039dd757a7dbd8
Component: engine
2014-07-07 10:09:31 -06:00
2f832eb657
Update Travis to use pretty Docker-based workers
...
These start up much faster and the only caveat is that we can't use "sudo" (which we don't currently use anyhow).
Also, I've updated the Go version here to match what's in the Dockerfile.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3e2ad6ffee68be7f3462fd1311408c7880cd8d88
Component: engine
2014-07-07 10:04:23 -06:00
03141b4b87
Fix DCO parsing for numeric github handles like cpuguy83
...
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: bbbf64242726dee184f82b3bb355327c9c85b274
Component: engine
2014-07-07 09:57:50 -06:00
1485171732
Merge pull request #6756 from kzys/lxc-linux
...
Skip lxc_template_unit_test.go on non-Linux platforms
Upstream-commit: e2c575c5a618c51f08d457fc227276dcb340e0f0
Component: engine
2014-07-07 18:46:46 +03:00
a5e156407f
Merge pull request #6878 from tianon/update-travis-github-username-regex
...
Update the Travis GitHub username regex to match the GitHub username requirements
Upstream-commit: cafb1bfd76b902437d06b713dc400b9076030ccb
Component: engine
2014-07-07 09:26:32 -06:00
4f072fe2fa
Merge pull request #6573 from mheon/ps_cleanup
...
Escape control and nonprintable characters in docker ps
Upstream-commit: 2ffd13bc3159ef3a1f97d9a59cfe7704264c2db1
Component: engine
2014-07-07 18:23:18 +03:00
1107c3c89f
Update the Travis GitHub username regex to match the GitHub username requirements
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e895817ad72c681b265bc647d18f201ceced90c5
Component: engine
2014-07-07 08:36:31 -06:00
9eda104cfe
Fix the systemd socket activation socket permissions
...
Fixes #6836
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3589f5b9c2d9e5cb6d057713aa8d591295c5f523
Component: engine
2014-07-07 08:09:25 -06:00
1991704086
Update running_riak_service.md
...
Upstream-commit: 963ee6ce795ae6608ee9acce4bc6298356d7f02f
Component: engine
2014-07-07 17:52:18 +04:00
e2109c74a8
add jclouds-docker client reference
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: )
Upstream-commit: 2f13d3a8e541b918135ea0bf0153f56927dd0511
Component: engine
2014-07-07 15:14:41 +02:00
58385e59a1
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
Upstream-commit: 323e6a3cf29677459a7bc658a0b5221e5675bc46
Component: engine
2014-07-07 11:16:55 +10:00
1f0f85afed
Merge pull request #6846 from irbull/master
...
Fix the parent/child relationship in the docs
Upstream-commit: cf01997ebeea84b31c35bb99253e5f3ca5b05533
Component: engine
2014-07-07 10:27:27 +10:00
0664d3e7f1
run.md: Fix references to cli
...
There are now no other occurrences of `#cli-` in this document.
TODO: Find other places with wrong links.
Upstream-commit: 95870ef3349920efc981a703d52f5832b79ee18e
Component: engine
2014-07-06 14:47:37 +02:00
3c88fb5533
Moved last build tests to integration-cli
...
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
2014-07-06 15:36:34 +04:00
