Commit Graph

10079 Commits

Author SHA1 Message Date
9e6770baa4 FIX 6613:launch docker fail with space named drive
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: acea488eb6ed40e6e5894e1b259ad861c9a98042
Component: engine
2014-09-19 12:07:53 -04:00
cbc12688b3 Merge pull request #8076 from duglin/MultiCopyAdd
Add support for copy/add with multiple src files
Upstream-commit: e91de29e0818b40adec155c3353e510d7bcf87b5
Component: engine
2014-09-19 09:01:29 -07:00
84da0ae620 Automatically clean up hello-world container with --rm
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
Upstream-commit: d78936b41842ce725f293f6bba1e3604c91682a3
Component: engine
2014-09-19 12:22:39 +02:00
639ef06c02 Merge pull request #8091 from jfrazelle/exec-main-manpage
Add docker-exec to main manpage
Upstream-commit: 39ed048aabbc9e2c2981339ce02169d79c6c4f1c
Component: engine
2014-09-19 16:17:11 +10:00
c01755f5a3 Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit
boot2docker shellinit will set any and all env vars needed.
Upstream-commit: 742eb7e0018e192b1ca32a045ec053c22261aecb
Component: engine
2014-09-19 00:46:15 -04:00
55b8ec78cc 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>
Upstream-commit: 05b8a1eb363ce03a9dfa3315fbac59c42af2df54
Component: engine
2014-09-18 20:12:13 -07:00
5503a73c31 Merge pull request #7694 from eyakubovich/master
Add an option to disable IP masquerading
Upstream-commit: 72e901559177a4a49f82779dbaa108487dce086d
Component: engine
2014-09-18 18:33:45 -07:00
1192584d04 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5
Fix duplicate iptables rules
Upstream-commit: d5537e0f039512c322efa6aec176349eff731499
Component: engine
2014-09-18 17:51:15 -07:00
be7f27050e Merge pull request #8061 from SvenDowideit/document-image-tarball-format
Add a little description of the image tarball format.
Upstream-commit: 82aa895c6dc592809d97284744dbd90c869097c5
Component: engine
2014-09-19 10:32:13 +10:00
c86477a1f5 Merge pull request #8111 from acroca/master
Grammar fix
Upstream-commit: 031231b5ed6993f6de88bca636a2b939677a3197
Component: engine
2014-09-18 17:27:24 -07:00
eec790d02f boot2docker shellinit will set any and all env vars needed.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 77975722492adcd791e1210a12e5f58fa81c29e8
Component: engine
2014-09-19 10:20:12 +10:00
b339cb93d3 'an file' -> 'a file' grammar fix
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
Upstream-commit: 4e11902d05816ba76e15f4af91dd4c507946072e
Component: engine
2014-09-19 08:12:33 +08:00
5770448fc1 test for panic on daemon restart
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 42dafe4bd84842532361a2d704493d124f438ab1
Component: engine
2014-09-18 21:54:42 +00:00
924f51b1d5 Initialize execStore while restoring a container from checkpoint.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 003afaf1ce9f9d2983c84093fb00f4b68a99b0fa
Component: engine
2014-09-18 21:40:53 +00:00
e5b81f13f8 tarsum: allow for alternate block ciphers
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 4e9925d780665149b8bc940d5ba242ada1973c4e
Component: engine
2014-09-18 10:34:58 -04:00
cfaf0bf98f Try to avoid issues when the Docker daemon restarts.
This change will allow the Docker daemon's init script to wait up to 5
minutes before being forcibly terminated by the initscript. Many
non-trivial containers will take more than the default 3 seconds to
stop, which can result in containers whose rootfs is still mounted and
will not restart when the daemon starts up again, or worse, orphan
processes that are still running.

Signed-off-by: Steven Merrill <steven.merrill@gmail.com>
Upstream-commit: 640d2ef6f54d96ac4fc3f0f745cb1e6a35148607
Component: engine
2014-09-18 08:21:00 -04:00
e4806321a3 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>
Upstream-commit: 184fe67bbc3759307adb6cb3e5338b5325bb88bb
Component: engine
2014-09-18 09:09:10 +04:00
c6ab84449d Fix logDone message for TestCopySingleFileToExistDir
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: aa0449c8139afec8e1446bb8650acad886b0a194
Component: engine
2014-09-18 09:02:05 +04:00
2508e0d078 Adding additional documentation for fixed-cidr networking
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu> (github: fkautz)

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3bb12d390a8a965e4dc680db7ecdab8c76f23990
Component: engine
2014-09-18 08:48:24 +04:00
d38719a9ac Add a little description of the image tarball format.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: db9f8ba55cf2293f590ea5d129463ffc9a4eb23d
Component: engine
2014-09-18 10:40:55 +10:00
44cb0660ec Merge pull request #8081 from abh1nav/master
Update remote_api_client_libraries.md
Upstream-commit: e9b5acba4b7a0a21e030b775b82351189367eb41
Component: engine
2014-09-18 10:24:53 +10:00
8f5fad7c3d Merge pull request #8025 from davidpelaez-forks/docs-fix
Improved X-Registry-Auth content instructions
Upstream-commit: c7c78acf815c081ca56616a8b4c145217329f5e3
Component: engine
2014-09-18 09:54:25 +10:00
bafb79990e Merge pull request #8097 from erikh/builder_maintainers
Add a new MAINTAINERS file for the builder.
Upstream-commit: f8be5f586f440b93affdff5ae182dc9e0dc98966
Component: engine
2014-09-17 15:42:34 -07:00
d03dfb81a2 Add a new MAINTAINERS file for the builder.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 1ff1befd12027f9de33f715e241a9818ee9a4a41
Component: engine
2014-09-17 15:36:04 -07:00
a701f25898 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
lower the number of allocations in broadcastwriter
Upstream-commit: 77d30e71122c7ec328f79836dcab4409f72e04b9
Component: engine
2014-09-17 15:26:44 -07:00
18373aa635 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>
Upstream-commit: 9aa71549d61875fcf0713a9da11b034e70e1c3b0
Component: engine
2014-09-17 14:38:22 -07:00
c978982604 Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
tarsum: name collision fix
Upstream-commit: 458b019e62bd41da08b99d49db9b2ee079fee29a
Component: engine
2014-09-17 21:59:39 +03:00
a7e4304ecd Add docker-exec to main manpage
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: fc75ade4f81229d5f6c36150b1c99c0edb7a8e8f
Component: engine
2014-09-17 11:46:49 -07:00
b0b8a2773b 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>
Upstream-commit: c5e6362c53cbbc09ddbabd5a7323e04438b57d31
Component: engine
2014-09-17 14:37:46 -04:00
0e86e16728 Merge pull request #8088 from unclejack/integcli-keep_permissions
integcli: run inaccessible context test in tmpdir
Upstream-commit: c171cf0cc3ac2a2b0d164fb5ead748e372f73837
Component: engine
2014-09-17 22:06:26 +04:00
699424477b integcli: run build tests in tmpdir
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: be924087eb5a2ab0ad79c069782e82805dd31d58
Component: engine
2014-09-17 20:05:33 +03:00
509598ebe9 Merge pull request #8084 from unclejack/improve_stdcopy
stdwriter: improve perf by avoiding buffer growth
Upstream-commit: 8b97e2c28732c5bf24e1e41bfa2033554e352821
Component: engine
2014-09-17 12:47:00 -04:00
995ea10dab Benchmark for StdWriter.Write
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 55cac6c9421702ca1e42b3e3f92266e865a5c769
Component: engine
2014-09-17 19:24:07 +04:00
1aa081f9b0 stdcopy: improve perf by avoiding buffer growth
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 277aa9c67415b9b76ab17daea583b51f8560a6a5
Component: engine
2014-09-17 18:06:17 +03:00
ba4bc005be move stdcopy to pkg/stdcopy
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1f03e60c2a96a92acae0e4d2fd604ab2c6d55473
Component: engine
2014-09-17 18:06:17 +03:00
c784504469 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>
Upstream-commit: adb6910095a18bef64a2da6815acd7d322a4c1e9
Component: engine
2014-09-17 08:09:39 -06:00
83725e3c4e Merge pull request #8083 from unclejack/install_apparmor
hack/install.sh: install apparmor when enabled
Upstream-commit: 459b403c2ff5341ab15bfaa8fe609571d1a50748
Component: engine
2014-09-17 08:05:29 -06:00
a9aedbcc8a use custom marshalling for JSONLog
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9851e8c4c18a89327ec2c1f04e36c9932c4231c1
Component: engine
2014-09-17 17:03:54 +03:00
529e054b9e 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...
Upstream-commit: bcf7ca07317adc02f03176546db642f4548285d6
Component: engine
2014-09-17 08:01:20 -06:00
cb5f7b942d add the timeutils package
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9ae3134dc9f0652ef48ec1fd445f42d8fe26de35
Component: engine
2014-09-17 14:30:08 +03:00
91fbeb48fc hack/install.sh: install apparmor when enabled
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9619ce9dd14d31cbf52c53741a1f35842bbe99a6
Component: engine
2014-09-17 12:13:31 +03:00
24cc16b5b6 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>
Upstream-commit: ad65930d0bda1026a02efd18e9f6c70dfdae4fb6
Component: engine
2014-09-17 03:42:57 -04:00
8679a2097b 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)
Upstream-commit: b7259dc6d45d5bfcb1c45a852bc63addb22e4bc2
Component: engine
2014-09-17 17:03:58 +10:00
e64fa9173d Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
use correct apt-key for test.docker.io/ubuntu
Upstream-commit: 41e625eb7cf1dd4fe747c9e63d25c73e99f98eb9
Component: engine
2014-09-17 00:06:57 -06:00
82736fd21b Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc
Add some documentation for the RestartPolicy feature.
Upstream-commit: b03f506303036e32b4a1058da69ee4385cb7979f
Component: engine
2014-09-16 20:06:55 -07:00
9ba82afe29 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>
Upstream-commit: 4dc4d56db9797159e2e329845e0b94e3e0f780a0
Component: engine
2014-09-16 20:00:15 -07:00
56a385e489 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>
Upstream-commit: 8c2b170c6ef3f8ec40c3a1bd6fdfc37f9271852a
Component: engine
2014-09-16 19:20:47 -05:00
118f175983 Merge pull request #8019 from thockin/add-host
Allow extra lines in /etc/hosts
Upstream-commit: f98a1f1f7d9b3ef10c13fc3b6438c978b4d6aa78
Component: engine
2014-09-16 17:19:16 -07:00
604739ede9 Allow extra lines in /etc/hosts
This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
2014-09-16 23:38:23 +00:00
dc62b54723 Merge pull request #7110 from tiborvass/merge-6907
Docker create (rebase of 6907)
Upstream-commit: ca39a3e36b8b76539bc30f0f4e2761222c50919f
Component: engine
2014-09-17 03:23:50 +04:00