toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,735 Commits 3 Branches 295 Tags
856affc265408eb401b48f45db2d2b806bfce4ef
Commit Graph
11735 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 7af08aef44 Merge pull request #6683 from vieux/add_links_inspect 
add links to inspect for 'linking' containers
Upstream-commit: e35a9a7def6113ffff2c624142ef194abfa7e916
Component: engine
 2014-06-26 17:33:02 -07:00
Victor Vieux 9a58f779fd Merge pull request #6708 from crosbymichael/fix-bunk-test 
Fix sleep command in tests
Upstream-commit: f7eaeae43cf2391327978473cf7027be887588e3
Component: engine
 2014-06-26 17:10:58 -07:00
Michael Crosby d3e75544ad Fix sleep command in tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 012091a28f8c2a96ad937f8c84992687e804ab71
Component: engine
 2014-06-26 17:09:41 -07:00
Michael Crosby 68391774fe Update libcontainer Context changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: c9fdb08bdafb90b76cfa804b079d2e446a3503e4
Component: engine
 2014-06-26 16:56:39 -07:00
Michael Crosby f1dd83f7f9 Update libcontainer to 53cfe0a1eba9145bf5329abbb52 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 41e75232914df5f5075d5d04cc2891fee9417067
Component: engine
 2014-06-26 16:56:39 -07:00
Michael Crosby 0256ecf832 Merge pull request #6657 from unclejack/refactor_truncindex 
refactor TruncIndex to use a trie & vendor deps
Upstream-commit: cab7894808d5b43590ec230c2391108536c34108
Component: engine
 2014-06-26 16:53:49 -07:00
Victor Vieux 1d3a6ac762 add doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 250b0d070c7d8fce3d75bafc02c31ab3e356ba2e
Component: engine
 2014-06-26 23:36:29 +00:00
Michael Crosby 8928210aef Merge pull request #6696 from cpuguy83/remove_dup_run_tests 
Remove integration tests moved to integration-cli(dups)
Upstream-commit: aecdbf347104907cf9fcfaa1bb44320f53f4f922
Component: engine
 2014-06-26 16:29:32 -07:00
Victor Vieux bb2e21109b fix rebase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 8162dc031246c55e34530d2b35ff7087f143d1c2
Component: engine
 2014-06-26 22:51:47 +00:00
Victor Vieux 47f54ad882 abort on error and fix debug 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0098360726e3df99e8f76dce9221a85dd89c2065
Component: engine
 2014-06-26 22:49:08 +00:00
Victor Vieux 7d486b32f4 add @tianon as maintainer of .dockerignore 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 42ca8a064b0e315c983997dbdb2560c40397eb0e
Component: engine
 2014-06-26 22:49:08 +00:00
Travis Cline a23ad7fc08 Add .dockerignore support 
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
 2014-06-26 22:49:08 +00:00
Travis Cline d4f4419563 Change misnamed TarFilter to TarWithOptions 
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 111ab125b954c8d28503e1922e742eb271cc5d04
Component: engine
 2014-06-26 22:49:08 +00:00
Michael Crosby cae5fc8047 Remove api test for bind mount / 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: af025f2a95090974eaaf3d8792d5f467d0a637be
Component: engine
 2014-06-26 15:39:45 -07:00
Solomon Hykes 92fe778319 Merge pull request #6625 from vieux/remove_dockerscript 
remove dockerscript
Upstream-commit: 69ec5824c3aec1dafb95264577807eac5afd9865
Component: engine
 2014-06-26 14:56:22 -07:00
Victor Vieux 12c0cff814 add links to inspect for 'linking' containers 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 55691e5fdc78b5c3015c7a481371e482878c14d2
Component: engine
 2014-06-26 20:51:38 +00:00
Matthew Heon 1581226df4 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)
Upstream-commit: fa3ac2d37032583a7c1171c24d71fbf93e330acc
Component: engine
 2014-06-26 15:51:26 -04:00
Tibor Vass c8ce01c6ab 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
Upstream-commit: 363b49948ab565d1496d2d0832c06fc54be6eb8f
Component: engine
 2014-06-26 15:06:02 -04:00
Victor Vieux 10316c12ae Merge pull request #6640 from ostezer/commands.go-linguistics-1 
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
 2014-06-26 11:59:49 -07:00
Michael Crosby cb56a2df49 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)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
 2014-06-26 10:50:18 -07:00
Brian Goff c725e7ada4 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)
Upstream-commit: 7606412d53b522774b2b7cea93fa2618b784e886
Component: engine
 2014-06-26 12:57:12 -04:00
Mike Snitzer 9c28be7542 devmapper: add thin-pool blocksize to the 'docker info' output 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: a2f3ce2294bbe998df24edd50f2b571d0b21bac8
Component: engine
 2014-06-26 12:39:16 -04:00
Mike Snitzer fbe2366f74 devmapper: document the default DM thin pool blocksize 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: 79f217e3501a43326bd532e8eb03182f7488f61c
Component: engine
 2014-06-26 12:06:41 -04:00
Tianon Gravi 6b9f5d4f5c Merge pull request #6690 from tianon/remove-apt-lists 
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists
Upstream-commit: 9aa840c50dde3d61e620bc8d43861ed0101ac990
Component: engine
 2014-06-26 08:13:12 -06:00
unclejack 55be9bc370 refactor TruncIndex to use a trie & vendor deps 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e0dad305791a7406cf819a27fa5a079a46a62acc
Component: engine
 2014-06-26 16:57:54 +03:00
O.S. Tezer befb61a0bc Anglicanisms: Grammatical correction (pos. adj. apost.) 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
 2014-06-26 08:41:58 +01:00
leeplay ab438bdbda Update examples/nodejs_web_app 
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 6bb6e422b5cd9e9ee97c5855a94b5776323a5626
Component: engine
 2014-06-26 15:19:30 +09:00
Tianon Gravi 8c910849c0 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)
Upstream-commit: 5e256799ddd6a297e22756363fc5eb079af0f07e
Component: engine
 2014-06-25 22:12:25 -06:00
Victor Vieux 305a7d211a Merge pull request #6684 from unclejack/fix_testparserunvolumes 
fix TestParseRunVolumes with Go 1.3 randomization
Upstream-commit: 87c5ecdd690dbdb40df793d4635051ce7848986d
Component: engine
 2014-06-25 18:54:25 -07:00
Victor Vieux 1a2f49a3ad Merge pull request #6686 from SvenDowideit/commit-parens-update-6310 
add missing docker commit parens (update 6310)
Upstream-commit: 3051ffe0fa9bbf7a12b1439a860abb5beeae057c
Component: engine
 2014-06-25 18:30:00 -07:00
Tianon Gravi 2e8c60ee30 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)
Upstream-commit: c42b5575e5dff5b3a117462e32eda0095528e3b2
Component: engine
 2014-06-25 19:07:39 -06:00
Sven Dowideit 51f8aff176 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)
Upstream-commit: 389916bf9ae62ded0e497512da22faba75d0cf2d
Component: engine
 2014-06-26 11:06:45 +10:00
Trent Ogren c384cf54c2 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)
Upstream-commit: 3fcb0d880aad65690cac304c30f72d0688a801d2
Component: engine
 2014-06-26 11:06:45 +10:00
Sven Dowideit ac17422c22 Merge pull request #6668 from erikh/fix-links-userguide 
Add ticks to docker links userguide, was not being rendered properly.
Upstream-commit: 917b7436aff96796de5b92653f62135017957790
Component: engine
 2014-06-26 10:08:08 +10:00
Solomon Hykes e43dcd9e0a Merge pull request #6635 from SvenDowideit/deputise-fredlf 
Upstream-commit: fe31ea7d0fc0945afcef7116c8d3eed89e3ab3b9
Component: engine
 2014-06-25 17:00:57 -07:00
Solomon Hykes 9a4ed6541e Merge pull request #6218 from vieux/update_maintainers 
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
 2014-06-25 17:00:32 -07:00
James Turnbull f113260ed3 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
Upstream-commit: 8eb34b2a0e73039b126c55c1c8f3328507041b80
Component: engine
 2014-06-25 16:36:51 -07:00
James Turnbull acf65eee05 Merge pull request #6590 from robertbachmann/patch 
Windows needs hardware virtualization
Upstream-commit: 6b6e915b858a9cf772e20ebb42cd67da4875157a
Component: engine
 2014-06-25 16:36:30 -07:00
Tianon Gravi 5c8857887a Merge pull request #6136 from thatsamguy/add-mageia-mkimage 
Add mkimage support for mageia using urpmi
Upstream-commit: 5ef0fe4b53e402928b44a6995e2f5957996a68a7
Component: engine
 2014-06-25 17:33:39 -06:00
Sven Dowideit 518e2ca12c add Docker version and branch to html header 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 5f6a7253321ffafdf84f53ea0253dd703b105c6b
Component: engine
 2014-06-25 16:23:33 -07:00
Sven Dowideit 03a05388ef Merge pull request #6639 from leeplay/userguide 
Update dockervolumes.md
Upstream-commit: d3fde633bdc675a7a4cac8d0519e4cd96b69a03a
Component: engine
 2014-06-26 09:19:34 +10:00
Tianon Gravi c959443de4 Merge pull request #6185 from jbeda/debian-init-fix 
Make debian init work when called repeatedly in quick succession
Upstream-commit: 02a0c7aca9b58be27dd52ecf24ddbaa5aebf91d5
Component: engine
 2014-06-25 17:17:04 -06:00
Tibor Vass f6a0457a3f Merge pull request #6649 from vieux/fix_api_return_codes_start_stop 
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
 2014-06-25 19:10:19 -04:00
Sven Dowideit 128e5bda28 Merge pull request #6665 from leeplay/patch-1 
Update dockervolumes.md
Upstream-commit: d15bc4a34234bd34d07f6e8c94a7ef9b24a55c1a
Component: engine
 2014-06-26 08:57:14 +10:00
unclejack 0e66ad87bd fix TestParseRunVolumes with Go 1.3 randomization 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f6e6cf9071b098f3e38b42597d94cd0768b17219
Component: engine
 2014-06-26 01:48:58 +03:00
Michael Crosby 2437455209 Merge pull request #6646 from tiborvass/fix-workdir 
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
 2014-06-25 15:19:51 -07:00
unclejack dbc649f34e Merge pull request #6661 from tiborvass/tar_untar_file 
Improve untar when using files instead of directories. Specifies behavior on non-existant targets.
Upstream-commit: 94370add0523352c94b4665d622b5dfe319b29ba
Component: engine
 2014-06-26 00:37:42 +03:00
Victor Vieux 9b24606fc1 Merge pull request #6664 from LK4D4/bench_on_truncindex_delete 
Add benchmarks on TrucnIndex.Delete
Upstream-commit: 17f653548260b7e1892dc5dd2153e508938af63f
Component: engine
 2014-06-25 14:30:28 -07:00
Michael Crosby 02d80c84fb Merge pull request #6669 from pwaller/issue-6652 
Allow re-mounting an existing mount with "remount"
Upstream-commit: 7be83a0857dbf2f426949fee9aec4039ab16c59e
Component: engine
 2014-06-25 14:18:25 -07:00
Peter Waller 8897c337e6 Allow re-mounting an existing mount with "remount" 
Without this line of code, if a volume is present in /proc/mounts,
it cannot be remounted with new mount options.

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: f87afda12344b726c1bfb49b2dc8b5995f86f4ab
Component: engine
 2014-06-25 22:06:24 +01:00