ade6bd7785
Merge pull request #6234 from jzupka/fix_check_default_ip
...
Adds check if default ip address is correct format.
2014-06-27 10:53:15 -07:00
e77729c2e0
Use last allocated port logic in port allocator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-27 10:51:26 -07:00
ffd68badc0
Make ErrPortAlreadyAllocated an error interface with a few extras,
...
adjust tests to fit.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-27 10:51:25 -07:00
dafddf461e
Restrict portallocator to Docker allocated ports
...
Port allocation status is stored in a global map: a port detected in use will remain as such for the lifetime of the daemon. Change the behavior to only mark as allocated ports which are claimed by Docker itself (which we can trust to properly remove from the allocation map once released). Ports allocated by other applications will always be retried to account for the eventually of the port having been released.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com> (github: icecrime)
2014-06-27 10:51:25 -07:00
38b005ec69
integcli: add test to ensure -v /:/ isn't allowed
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-27 19:51:24 +03:00
a1b6f350e8
correct typo - desination -> destination
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-27 19:49:40 +03:00
510f1ba438
Merge pull request #6701 from crosbymichael/mount-root
...
Allow / as source of -v
2014-06-27 19:03:21 +03:00
815279c240
Update dockerimages.md
...
fix typo
2014-06-27 11:09:09 -04:00
4361366783
Document memory limit sizing in manpages
...
The -m flag permits the setting of a memory limit when running a Docker
container. The actual limit set must be a multiple of page size on Linux, so
whatever number the uses passes in will be rounded up if needed. Document this
behavior to prevent confusion. Also fixed several small formatting and grammar
issues in the docker run manpage.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-06-27 10:07:50 -04:00
9b9d698081
Merge pull request #6729 from vincentbernat/fix/mkimage-use-var-tmp
...
Update mkimage scripts to use /var/tmp by default instead of /tmp
2014-06-27 08:04:05 -06:00
2fcbfb5a66
Adds check if default ip address is correct format.
...
It avoids hidden error when ports are redirected from
container to host using -p host_port:guest_port.
Docker-DCO-1.1-Signed-off-by: Jiří Župka <jzupka@redhat.com> (github: jzupka)
2014-06-27 15:55:20 +02:00
287e604a8f
mkimage: use /var/tmp by default instead of /tmp
...
Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.
As explained in #6456 , the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
2014-06-27 14:43:12 +02:00
57d86a5619
Use State waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 15:07:40 +04:00
47065b9045
State refactoring and add waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 15:05:48 +04:00
a7722d752d
Merge pull request #6718 from mchelen/patch-1
...
Update dockerizing.md
2014-06-27 17:38:54 +10:00
0bfa14a70a
Update dockerizing.md
...
fix typo
2014-06-27 02:34:47 -04:00
bc8d618cde
Merge pull request #6716 from leeplay/master
...
Update nodejs_web_app.md
2014-06-26 23:21:36 -07:00
b074e9b01d
Merge pull request #6676 from berendt/opensuse_import_public_gpg_key
...
Import public GPG key after adding the openSUSE repository
2014-06-26 23:21:10 -07:00
debbb26291
Merge pull request #6712 from SvenDowideit/pr_out_remove_superfluous_reptition_from_usingdocker_md
...
Remove superfluous reptition from usingdocker.md
2014-06-26 23:20:51 -07:00
15ea1ca1f0
Update nodejs_web_app.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
2014-06-27 11:39:58 +09:00
d14cfc8d43
sort flags with the same name in a consistent order
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
2014-06-27 01:46:59 +00:00
748aaf3530
Remove superfluous reptition from usingdocker.md
...
Clarify wording about default docker ps options
Fix typo in dockerlinks.md
Docker-DCO-1.1-Signed-off-by: Paul Weaver <pauweave@cisco.com> (github: ch3pjw)
2014-06-27 11:43:29 +10:00
425ab3da5e
Merge pull request #6709 from SvenDowideit/show-my-orgs
...
Show the user's orgs, not-Sam's email
2014-06-27 11:38:52 +10:00
5cabfd1526
Merge pull request #6694 from leeplay/examples
...
Update examples/nodejs_web_app
2014-06-27 11:27:02 +10:00
67f6b0fd43
Merge pull request #6703 from crosbymichael/update-libcontainer-dep
...
Update libcontainer to 53cfe0a1eba9145bf5329abb
2014-06-26 21:20:59 -04:00
e817681581
Yes, ok, not-Sam
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-27 11:10:20 +10:00
6e3fe93148
Merge pull request #6579 from vieux/dockerignore
...
Rebased Dockerignore
2014-06-26 21:00:43 -04:00
e35a9a7def
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
2014-06-26 17:33:02 -07:00
f7eaeae43c
Merge pull request #6708 from crosbymichael/fix-bunk-test
...
Fix sleep command in tests
2014-06-26 17:10:58 -07:00
012091a28f
Fix sleep command in tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 17:09:41 -07:00
c9fdb08bda
Update libcontainer Context changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 16:56:39 -07:00
41e7523291
Update libcontainer to 53cfe0a1eba9145bf5329abbb52
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 16:56:39 -07:00
cab7894808
Merge pull request #6657 from unclejack/refactor_truncindex
...
refactor TruncIndex to use a trie & vendor deps
2014-06-26 16:53:49 -07:00
250b0d070c
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-26 23:36:29 +00:00
aecdbf3471
Merge pull request #6696 from cpuguy83/remove_dup_run_tests
...
Remove integration tests moved to integration-cli(dups)
2014-06-26 16:29:32 -07:00
8162dc0312
fix rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-26 22:51:47 +00:00
0098360726
abort on error and fix debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-26 22:49:08 +00:00
42ca8a064b
add @tianon as maintainer of .dockerignore
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-26 22:49:08 +00:00
9189db3aff
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
2014-06-26 22:49:08 +00:00
111ab125b9
Change misnamed TarFilter to TarWithOptions
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
2014-06-26 22:49:08 +00:00
af025f2a95
Remove api test for bind mount /
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 15:39:45 -07:00
69ec5824c3
Merge pull request #6625 from vieux/remove_dockerscript
...
remove dockerscript
2014-06-26 14:56:22 -07:00
55691e5fdc
add links to inspect for 'linking' containers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-26 20:51:38 +00:00
fa3ac2d370
Fixed manpage generation script and README
...
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-06-26 15:51:26 -04:00
363b49948a
Merge pull request #6693 from tianon/bash-complete-force-rm
...
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
2014-06-26 15:06:02 -04:00
56a0f49dcc
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
2014-06-26 11:59:49 -07:00
e39b8eade1
Allow / as source of -v
...
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed. You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 10:50:18 -07:00
7606412d53
Remove integration tests moved to integration-cli(dups)
...
integration/commands_test.go/TestRunHostname == integration-cli/docker_cli_run_tests.go/TestModeHostname
integration/commands_test.go/TestRunWorkdir == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestRunWorkdirExists == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestAttachstdIn == integration-cli/docker_cli_run_tests.go/TestRunStdinPipe
integration/commands_test.go/TestCmdLogs == integration-cli/docker_cli_logs_tests.go
integration/commands_test.go/TestCmdKill == integration-cli/docker_cli_kill_test.go
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-06-26 12:57:12 -04:00
a2f3ce2294
devmapper: add thin-pool blocksize to the 'docker info' output
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
2014-06-26 12:39:16 -04:00
79f217e350
devmapper: document the default DM thin pool blocksize
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
2014-06-26 12:06:41 -04:00
Michael Crosby
Erik Hollensbe
Arnaud Porterie
unclejack
unclejack
Mike Chelen
Matthew Heon
Tianon Gravi
Jiří Župka
Vincent Bernat
Alexandr Morozov
Sven Dowideit
James Turnbull
leeplay
Jonathan Boulle
Paul Weaver
Tibor Vass
SvenDowideit
Victor Vieux
Victor Vieux
Travis Cline
Solomon Hykes
Brian Goff
Mike Snitzer