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

9388 Commits

Author SHA1 Message Date
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
Michael Crosby f021cd64ed Merge pull request #6636 from saaadhu/master 
Fix typo in README.md
 2014-07-08 16:35:26 -07: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
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
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
Tibor Vass 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
Michael Crosby f34510b123 Merge pull request #6813 from gsalgado/convert-testgetimagesjson 
Convert TestGetImagesJSON into several unit tests
 2014-07-07 13:40:38 -07:00
unclejack 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
Guilherme Salgado 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
Timothy Hobbs 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
Michael Crosby 3993f9d581 Merge pull request #6799 from LK4D4/refactor_portallocator 
Refactoring portallocator
 2014-07-07 12:39:36 -07:00
Michael Crosby bade039bda Merge pull request #6821 from LK4D4/broadcast_writer_refactor 
Broadcast writer refactor
 2014-07-07 12:15:47 -07:00
Vincent Batts 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
Victor Vieux 578513095c Merge pull request #6850 from leeplay/patch-2 
Update README.md
 2014-07-07 11:50:27 -07:00
Michael Crosby 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
Michael Crosby 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
unclejack 2e4f99d99c Merge pull request #6645 from snitm/dmthinp-devel 
Dmthinp devel
 2014-07-07 21:20:31 +03:00
Victor Vieux 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
Michael Crosby 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
Michael Crosby 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
Victor Vieux 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
Victor Vieux 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
unclejack 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
Tianon Gravi 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
unclejack 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
Tianon Gravi 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
Tianon Gravi 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