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
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
0327b0f4af
Merge pull request #6899 from sjp38/patch-1
...
understanding-docker: Use consistent term
2014-07-08 08:41:20 -04:00
a247b63aa1
Typo fix
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-08 10:01:26 +01:00
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
55915b8e00
Merge pull request #6760 from jamtur01/contrib
...
Minor updates and fixes to the CONTRIBUTING doc
2014-07-07 18:42:29 -07:00
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
42a28f79dc
Merge pull request #6849 from leeplay/patch-1
...
Update README.md
2014-07-07 16:43:57 -07:00
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
0284e5dfea
Merge pull request #6871 from prosto-chewey/patch-1
...
Update running_riak_service.md
2014-07-08 09:35:01 +10:00
d20367c216
Merge pull request #6870 from andreaturli/doc/jclouds-client
...
add jclouds-docker client reference
2014-07-08 09:29:27 +10:00
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
714b63d1be
Add repo/tag parsing on the daemon for pull and import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-07 23:09:42 +00:00
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
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
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
52c58b9ea0
Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
...
docker save: fix the 'repositories' file
2014-07-07 17:26:52 -04:00
f34510b123
Merge pull request #6813 from gsalgado/convert-testgetimagesjson
...
Convert TestGetImagesJSON into several unit tests
2014-07-07 13:40:38 -07:00
e7db0d4f44
Merge pull request #6829 from unclejack/update_archive_tar
...
update vendored archive/tar to lower the number of memory allocations
2014-07-07 23:35:19 +03:00
627805f5f8
Convert TestGetImagesJSON into several unit tests
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
2014-07-07 21:55:26 +02:00
ea583fda97
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)
2014-07-07 19:45:36 +00:00
3993f9d581
Merge pull request #6799 from LK4D4/refactor_portallocator
...
Refactoring portallocator
2014-07-07 12:39:36 -07:00
bade039bda
Merge pull request #6821 from LK4D4/broadcast_writer_refactor
...
Broadcast writer refactor
2014-07-07 12:15:47 -07:00
600f65b247
docker save: more integration tests
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-07-07 14:58:27 -04:00
578513095c
Merge pull request #6850 from leeplay/patch-2
...
Update README.md
2014-07-07 11:50:27 -07:00
35b511b6d0
Merge pull request #6702 from mrunalp/dev/helper_fns
...
Move setting hostConfig and pulling images into helper functions.
2014-07-07 11:39:27 -07:00
219a3345de
Merge pull request #6452 from mheon/selinux_btrfs_fix
...
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
2014-07-07 11:34:50 -07:00
2e4f99d99c
Merge pull request #6645 from snitm/dmthinp-devel
...
Dmthinp devel
2014-07-07 21:20:31 +03:00
880c98d2d3
Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
...
Moved last build tests to integration-cli
2014-07-07 10:53:26 -07:00
860c664ccb
Merge pull request #6508 from mheon/signals
...
Increase size of buffer for signal forwarding with --sig-proxy
2014-07-07 10:45:31 -07:00
bcec0f30e8
Merge pull request #6371 from jpetazzo/6370-masquerade
...
Select masquerade by outgoing interface rather than by destination subne...
2014-07-07 10:28:31 -07:00
dd89904ad3
Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
...
add client OS and arch to docker version
2014-07-07 10:15:30 -07:00
4a20c9b005
Merge pull request #6823 from folieadrien/move_integration_tests
...
Convert TestGetImagesByName into unit and integration-cli test
2014-07-07 10:13:19 -07:00
c2653b0a9e
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)
2014-07-07 10:54:03 -06:00
9f61e233c6
Standardize "curl" arguments across the repo to be or include "-sSL"
...
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 10:35:38 -06:00
de07654c60
Merge pull request #6884 from tianon/use-docker-based-travis
...
Update Travis to use pretty Docker-based workers
2014-07-07 10:09:31 -06:00
3e2ad6ffee
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)
2014-07-07 10:04:23 -06:00
09927fdbae
Merge pull request #6883 from tianon/fix-dco-parsing-for-numeric
...
Fix DCO parsing for numeric github handles like cpuguy83
2014-07-07 10:02:02 -06:00
bbbf642427
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)
2014-07-07 09:57:50 -06:00
e2c575c5a6
Merge pull request #6756 from kzys/lxc-linux
...
Skip lxc_template_unit_test.go on non-Linux platforms
2014-07-07 18:46:46 +03:00
cafb1bfd76
Merge pull request #6878 from tianon/update-travis-github-username-regex
...
Update the Travis GitHub username regex to match the GitHub username requirements
2014-07-07 09:26:32 -06:00
2ffd13bc31
Merge pull request #6573 from mheon/ps_cleanup
...
Escape control and nonprintable characters in docker ps
2014-07-07 18:23:18 +03:00
07be572f8e
Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms
...
Fix the systemd socket activation socket permissions
2014-07-07 08:56:04 -06:00
e895817ad7
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)
2014-07-07 08:36:31 -06:00
3589f5b9c2
Fix the systemd socket activation socket permissions
...
Fixes #6836
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 08:09:25 -06:00
963ee6ce79
Update running_riak_service.md
2014-07-07 17:52:18 +04:00
2f13d3a8e5
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: )
2014-07-07 15:14:41 +02:00
ebbfdf0a0f
Reformat to keep line length within 80 characters
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-07 12:01:04 +01:00
323e6a3cf2
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
2014-07-07 11:16:55 +10:00
cf01997ebe
Merge pull request #6846 from irbull/master
...
Fix the parent/child relationship in the docs
2014-07-07 10:27:27 +10:00
James Turnbull
Tianon Gravi
Tom Fotherby
SeongJae Park
Solomon Hykes
SvenDowideit
Michael Crosby
Sven Dowideit
Victor Vieux
Roberto Gandolfo Hashioka
Victor Vieux
Tibor Vass
unclejack
Guilherme Salgado
Timothy Hobbs
Vincent Batts
Chewey
Andrea Turli