Commit Graph

10609 Commits

Author SHA1 Message Date
Erik Hollensbe
41f2b3c6bc Merge pull request #8128 from bfirsh/two-level-cli-commands
Add support for multiple level CLI commands
2014-09-19 11:14:36 -07:00
Ben Firshman
e1b968f198 Add support for multiple level CLI commands
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-19 10:43:50 -07:00
Erik Hollensbe
e91de29e08 Merge pull request #8076 from duglin/MultiCopyAdd
Add support for copy/add with multiple src files
2014-09-19 09:01:29 -07:00
Sven Dowideit
39ed048aab Merge pull request #8091 from jfrazelle/exec-main-manpage
Add docker-exec to main manpage
2014-09-19 16:17:11 +10:00
James Turnbull
742eb7e001 Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit
boot2docker shellinit will set any and all env vars needed.
2014-09-19 00:46:15 -04:00
Doug Davis
05b8a1eb36 Add support for copy/add with multiple src files
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-18 20:12:13 -07:00
Michael Crosby
72e9015591 Merge pull request #7694 from eyakubovich/master
Add an option to disable IP masquerading
2014-09-18 18:33:45 -07:00
Michael Crosby
d5537e0f03 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5
Fix duplicate iptables rules
2014-09-18 17:51:15 -07:00
Sven Dowideit
82aa895c6d Merge pull request #8061 from SvenDowideit/document-image-tarball-format
Add a little description of the image tarball format.
2014-09-19 10:32:13 +10:00
Jessie Frazelle
031231b5ed Merge pull request #8111 from acroca/master
Grammar fix
2014-09-18 17:27:24 -07:00
Sven Dowideit
7797572249 boot2docker shellinit will set any and all env vars needed.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-19 10:20:12 +10:00
Albert Callarisa
4e11902d05 'an file' -> 'a file' grammar fix
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
2014-09-19 08:12:33 +08:00
Alexandr Morozov
e909bbccc3 Merge pull request #8115 from vishh/exec_panic_fix
Initialize execStore while restoring a container from checkpoint.
2014-09-19 02:22:51 +04:00
Jessica Frazelle
42dafe4bd8 test for panic on daemon restart
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-18 21:54:42 +00:00
Vishnu Kannan
003afaf1ce Initialize execStore while restoring a container from checkpoint.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-18 21:40:53 +00:00
unclejack
db5edfb748 Merge pull request #8105 from LK4D4/build_test_little_fix
Little fixes in cli build tests
2014-09-18 10:32:10 +03:00
Alexandr Morozov
184fe67bbc Add Build prefix to Copy tests
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:09:10 +04:00
Alexandr Morozov
aa0449c813 Fix logDone message for TestCopySingleFileToExistDir
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:02:05 +04:00
Sven Dowideit
db9f8ba55c Add a little description of the image tarball format.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-18 10:40:55 +10:00
Sven Dowideit
e9b5acba4b Merge pull request #8081 from abh1nav/master
Update remote_api_client_libraries.md
2014-09-18 10:24:53 +10:00
Sven Dowideit
c7c78acf81 Merge pull request #8025 from davidpelaez-forks/docs-fix
Improved X-Registry-Auth content instructions
2014-09-18 09:54:25 +10:00
Michael Crosby
f8be5f586f Merge pull request #8097 from erikh/builder_maintainers
Add a new MAINTAINERS file for the builder.
2014-09-17 15:42:34 -07:00
Erik Hollensbe
1ff1befd12 Add a new MAINTAINERS file for the builder.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-17 15:36:04 -07:00
Michael Crosby
77d30e7112 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
lower the number of allocations in broadcastwriter
2014-09-17 15:26:44 -07:00
Tibor Vass
12f522ac65 Merge pull request #8095 from jfrazelle/cp-parse-subcommand-rebase
Removed runconfig.ParseSubcommand
2014-09-17 18:04:28 -04:00
Oh Jinkyun
9aa71549d6 Removed runconfig.ParseSubcommand
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
2014-09-17 14:38:22 -07:00
unclejack
458b019e62 Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
tarsum: name collision fix
2014-09-17 21:59:39 +03:00
Jessica Frazelle
fc75ade4f8 Add docker-exec to main manpage
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-17 11:46:49 -07:00
Vincent Batts
c5e6362c53 tarsum: name collision fix
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-17 14:37:46 -04:00
Alexandr Morozov
c171cf0cc3 Merge pull request #8088 from unclejack/integcli-keep_permissions
integcli: run inaccessible context test in tmpdir
2014-09-17 22:06:26 +04:00
unclejack
be924087eb integcli: run build tests in tmpdir
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 20:05:33 +03:00
Tibor Vass
8b97e2c287 Merge pull request #8084 from unclejack/improve_stdcopy
stdwriter: improve perf by avoiding buffer growth
2014-09-17 12:47:00 -04:00
Jessie Frazelle
129da8f842 Merge pull request #8085 from tianon/hack-install-location
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
2014-09-17 09:20:33 -07:00
unclejack
2f6b1d7f4e Merge pull request #6 from LK4D4/benchmark_for_8084
Benchmark for StdWriter.Write
2014-09-17 18:39:46 +03:00
Alexandr Morozov
55cac6c942 Benchmark for StdWriter.Write
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-17 19:24:07 +04:00
unclejack
277aa9c674 stdcopy: improve perf by avoiding buffer growth
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 18:06:17 +03:00
unclejack
1f03e60c2a move stdcopy to pkg/stdcopy
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 18:06:17 +03:00
Tianon Gravi
adb6910095 Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-17 08:09:39 -06:00
Tianon Gravi
459b403c2f Merge pull request #8083 from unclejack/install_apparmor
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
unclejack
9851e8c4c1 use custom marshalling for JSONLog
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 17:03:54 +03:00
Tianon Gravi
bcf7ca0731 Merge pull request #8080 from SvenDowideit/test-for-ext4-fs-kernel-options
It seems that we need these 2 options enabled for both aufs and devicema...
2014-09-17 08:01:20 -06:00
unclejack
9ae3134dc9 add the timeutils package
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 14:30:08 +03:00
unclejack
9619ce9dd1 hack/install.sh: install apparmor when enabled
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 12:13:31 +03:00
Abhinav Ajgaonkar
ad65930d0b Update remote_api_client_libraries.md
Ordering all clients alphabetically, by language.
Including all available languages in `page_keywords`.

Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com>
2014-09-17 03:42:57 -04:00
Sven Dowideit
b7259dc6d4 It seems that we need these 2 options enabled for both aufs and devicemapper drivers when running on EXT4 - so test for them
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-17 17:03:58 +10:00
Tianon Gravi
41e625eb7c Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
use correct apt-key for test.docker.io/ubuntu
2014-09-17 00:06:57 -06:00
Fred Lifton
b03f506303 Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc
Add some documentation for the RestartPolicy feature.
2014-09-16 20:06:55 -07:00
Eugene Yakubovich
4dc4d56db9 Add an option to disable IP masquerading
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.

Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com>
2014-09-16 20:00:15 -07:00
David Pelaez
8c2b170c6e Improved X-Registry-Auth content instructions
Hi,

this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:

* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.

I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.

Thanks to all the contributors for bringing so much awesomeness to the linux world. :)

Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me>
2014-09-16 19:20:47 -05:00
Jessie Frazelle
f98a1f1f7d Merge pull request #8019 from thockin/add-host
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00