p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,138 Commits 2 Branches 295 Tags
ab438bdbda503e176ab6d9bb3ec0bdf1536c853a
Commit Graph

9138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Tibor Vass
e6272cf4e9 Merge pull request #6666 from erikh/fix-escaping-whitespace 
fix whitespace that precedes the escape in a multiline string.
Upstream-commit: b85f20cf1311e4b654cdb48781d16533e66b7013
Component: engine
 2014-06-25 17:03:19 -04:00
Erik Hollensbe
4526ee08e7 fix whitespace that precedes the escape in a multiline string. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
 2014-06-25 13:39:47 -07:00
LK4D4
bc0ef19fac Combined AddGet benchmark 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 04a9fe1e62345d282985724b9eb0cd7446c08449
Component: engine
 2014-06-25 22:49:38 +04:00
Tibor Vass
2ab25c0f86 add integration test for --workdir=/ 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
 2014-06-25 11:02:59 -04:00
Tibor Vass
3325b6e290 fix bug in FollowSymlinkInScope when link == root 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
 2014-06-25 11:02:59 -04:00
Tibor Vass
bb9a141a59 improve untar when using files instead of directories. Specifies behavior on non-existant targets. 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 1c8d3106df0bd2aba304c7b3863949ca11c2b133
Component: engine
 2014-06-25 09:35:26 -04:00
Erik Hollensbe
053aa6d8a6 Add ticks to docker links userguide, was not being rendered properly, fix spelling error in /etc/hosts 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 6b2901954107c438d8e92dc6f595ec9bcd179777
Component: engine
 2014-06-25 02:18:16 -07:00
hyeongkyu.lee
64d580f03b Update dockervolumes.md 
~~~
kyu@kyu-HP-EliteBook-2570p:~/apps/docker/volume$ docker run -v /dbdata --name dbdata2 ubuntu
2014/06/25 14:17:44 Error response from daemon: No command specified
~~~
Upstream-commit: 9026888b109e6dd1042259ffd9e707d9e5f76d34
Component: engine
 2014-06-25 14:53:59 +09:00
Alexandr Morozov
e76ace6106 Add benchmarks on TrucnIndex.Delete 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7c8445826fdce3e46253a6e194a33407ed9bd154
Component: engine
 2014-06-25 09:37:39 +04:00
James Turnbull
5252b72a99 Merge pull request #6656 from andersryanc/master 
Remove Docs viewport tag to fix iPhone scaling
Upstream-commit: 01d4fd76dd60a24b24adbb8bb85623738c7636a9
Component: engine
 2014-06-24 20:16:47 -07:00
Victor Vieux
9328b2b9ef fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b18c72155530aef29028694d7a92d97440c04a78
Component: engine
 2014-06-25 01:44:48 +00:00
Sven Dowideit
1561a70302 Merge pull request #6658 from amuino/doc_pause_unpause 
Document the pause and unpause commands available on API v1.12 onwards
Upstream-commit: 11902d4ccbfe0b988f66c45b4b303d3fffad62b7
Component: engine
 2014-06-25 10:00:36 +10:00
Victor Vieux
f9d60717da Merge pull request #6659 from vieux/pr_6248 
Change floats to ints recursively on env encoding
Upstream-commit: c72cfa8d45f8b9c3eff7f0d5b56592605dd9dc77
Component: engine
 2014-06-24 16:51:28 -07:00
LK4D4
5281f733c2 Change floats to ints recursively on env encoding 
Fixes #6246
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d3d1c5d2b762a32fbee348702af96f9c00fff83
Component: engine
 2014-06-24 23:39:26 +00:00
Michael Crosby
b8473175aa Merge pull request #6651 from erikh/6002-conflicting-iptables-options 
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
Upstream-commit: e8997002545c2dcce476f296cf2693c98539a828
Component: engine
 2014-06-24 15:56:05 -07:00
Erik Hollensbe
58acc86336 Add mutex warning when specifying -icc or -ip-forward and -iptables=false 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 05f293e65eeb7d1c86ba5644ed8d682aaeddd53d
Component: engine
 2014-06-24 15:49:35 -07:00
Abel Muiño
f728e9c8d0 Document the pause and unpause commands available on API v1.12 onwards 
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Upstream-commit: 901a47daff63a4a7f22cbe556741081334c76572
Component: engine
 2014-06-25 00:41:57 +02:00
Ryan Anderson
18efee874d Remove viewport tag to fix iPhone scaling 
Upstream-commit: 7b1dd54d5d29b5d15e2081cc21b836a1907162cf
Component: engine
 2014-06-24 15:16:40 -07:00
Tibor Vass
a65bf57706 Merge pull request #6654 from vieux/fix_test_search 
Fix search integration-cli test
Upstream-commit: 4f5e91e3b4fdbd29947ac9543f0352545b457e02
Component: engine
 2014-06-24 17:51:07 -04:00
Sven Dowideit
909b3a8ba8 Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs 
move the man pages to the docs/ dir
Upstream-commit: 11ef08402a5b8d39b1ec3fe004aa1d4b4c0ca5b3
Component: engine
 2014-06-25 07:50:09 +10:00
Victor Vieux
06a813f16e Merge pull request #6643 from kzys/freebsd-cp 
cp's -T and --reflink=auto are only available on GNU coreutils
Upstream-commit: 6d8e95557cd63b6e8302255d6e070f24d7c2e6d5
Component: engine
 2014-06-24 14:29:18 -07:00
Victor Vieux
d6e6af197e Fix search integration-cli test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: dd258553b1cbe58d0cb4f8d505aea6f3b1ae6543
Component: engine
 2014-06-24 21:16:34 +00:00
Michael Crosby
3d6c57f495 Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor 
Update libcontainer dep to 5210a236b92a8022a673108f347
Upstream-commit: 408963ed4d4ea5ffca99c08b3e22bf720eb19b88
Component: engine
 2014-06-24 13:51:04 -07:00
unclejack
7c1e43e819 Merge pull request #6595 from LK4D4/env_benchmarks 
Benchmarks for engine/env
Upstream-commit: 1059e166fd4fbe88a05f182139b6fc5fc95ab6b3
Component: engine
 2014-06-24 23:35:00 +03:00
unclejack
df9f902ba5 Merge pull request #6648 from LK4D4/truncindex_bench 
Truncindex benchmarks
Upstream-commit: c4dbd4f7c0ff3f33705db21a709c3475ebe0770b
Component: engine
 2014-06-24 22:10:33 +03:00
Tibor Vass
126ec1c58c Merge pull request #6216 from gsalgado/convert-integration-tests 
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
Upstream-commit: f6d11c8d50387472fd7e34eea66b79237238c321
Component: engine
 2014-06-24 14:53:10 -04:00
Victor Vieux
986327e6e1 return 304 is status isn't modified in start and stop 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
 2014-06-24 18:31:56 +00:00
Michael Crosby
0daa61f085 Rename libcontainer.Container to libcontainer.Config 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 1dc8e2ffab795f4999a122b4a576d54e03c7c61a
Component: engine
 2014-06-24 11:31:03 -07:00
Michael Crosby
d4e9300e80 Update libcontainer references 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: cee6f4506c79c6fc21769d427ac4dd51c28450c3
Component: engine
 2014-06-24 11:31:03 -07:00