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
9aa840c50d
Merge pull request #6690 from tianon/remove-apt-lists
...
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists
2014-06-26 08:13:12 -06:00
e0dad30579
refactor TruncIndex to use a trie & vendor deps
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-26 16:57:54 +03:00
714c1bd8ca
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-26 08:41:58 +01:00
6bb6e422b5
Update examples/nodejs_web_app
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
2014-06-26 15:19:30 +09:00
5e256799dd
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-25 22:12:25 -06:00
87c5ecdd69
Merge pull request #6684 from unclejack/fix_testparserunvolumes
...
fix TestParseRunVolumes with Go 1.3 randomization
2014-06-25 18:54:25 -07:00
3051ffe0fa
Merge pull request #6686 from SvenDowideit/commit-parens-update-6310
...
add missing docker commit parens (update 6310)
2014-06-25 18:30:00 -07:00
c42b5575e5
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists (trimming at least 40MB and forcing "apt-get update" in dependent images before packages can be installed)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-25 19:07:39 -06:00
389916bf9a
Add the missing paren to the documentation for docker commit too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-06-26 11:06:45 +10:00
3fcb0d880a
Add missing parenthesis in docs for -author switch
...
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com> (github: misfo)
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com> (github: SvenDowideit)
2014-06-26 11:06:45 +10:00
917b7436af
Merge pull request #6668 from erikh/fix-links-userguide
...
Add ticks to docker links userguide, was not being rendered properly.
2014-06-26 10:08:08 +10:00
fe31ea7d0f
Merge pull request #6635 from SvenDowideit/deputise-fredlf
2014-06-25 17:00:57 -07:00
c9e647e42f
Merge pull request #6218 from vieux/update_maintainers
2014-06-25 17:00:32 -07:00
8eb34b2a0e
Merge pull request #6626 from SvenDowideit/pr_out_updated_cloud_sdk_download_link_added_a_command_to_set_the_project
...
Updated Cloud SDK download link, added a command to set the project
2014-06-25 16:36:51 -07:00
6b6e915b85
Merge pull request #6590 from robertbachmann/patch
...
Windows needs hardware virtualization
2014-06-25 16:36:30 -07:00
5ef0fe4b53
Merge pull request #6136 from thatsamguy/add-mageia-mkimage
...
Add mkimage support for mageia using urpmi
2014-06-25 17:33:39 -06:00
5f6a725332
add Docker version and branch to html header
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-06-25 16:23:33 -07:00
d3fde633bd
Merge pull request #6639 from leeplay/userguide
...
Update dockervolumes.md
2014-06-26 09:19:34 +10:00
James Turnbull
leeplay
Jonathan Boulle
Paul Weaver
Sven Dowideit
Tibor Vass
SvenDowideit
Michael Crosby
Victor Vieux
Victor Vieux
Travis Cline
Solomon Hykes
Matthew Heon
Brian Goff
Tianon Gravi
unclejack
O.S. Tezer
Trent Ogren