a1bab7db37
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 67c254a60a77c1f80804be7ab97353530987c846
Component: engine
2014-09-16 10:37:50 -07:00
f8b8f5b4f2
Merge pull request #8026 from tonistiigi/validate-context-error-handling
...
Improve ValidateContextDirectory error handling.
Upstream-commit: 23bb6513a05fd8968e192a74dd2b654761e18d1e
Component: engine
2014-09-16 12:44:55 -04:00
d0a61e9c18
Improve ValidateContextDirectory error handling.
...
- Errors sent to the walker callback functions were ignored. This meant that
one could get a panic when calling methods on a nil FileInfo object. For
example when the file did not exists any more.
- Lstat calls inside walker callback are reduntant because walker already calls
Lstat and passes the result to the callback.
- Error returned from filepath.Rel() can never be EACCES because it compares
strings and does not care about actual files.
- If Matched() returns error then ValidateContextDirectory() must return error.
Currently it still kept walking although the outcome was already known.
- Function will now fail in case of unknown error(not EACCES nor ENOENT).
Previous implementation did not make a clear decision about this (but
panicked because of the issues above).
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: a8914293fbb1328f9a5c931bd51e34f5d6584e17
Component: engine
2014-09-16 19:17:34 +03:00
0eea93fc0c
Merge pull request #5977 from vbatts/vbatts-tarsum_xattrs
...
tarsum: include xattr headers in to the checksum
Upstream-commit: 4da86f88a045a08e0e1aaf6025c7a0ce9da60c31
Component: engine
2014-09-16 18:07:03 +03:00
abfdc34927
Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
...
Consistently use 'sudo docker' in examples
Upstream-commit: b64558907139911b86d846de70ab859504cc45a2
Component: engine
2014-09-16 08:43:58 -04:00
dade82e420
Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg
...
Added missing 't' from the end of the /images/{{id}}/get eg.
Upstream-commit: b040ba99d09ec18a3dc7f8d9955ae63d6ede7170
Component: engine
2014-09-16 08:43:26 -04:00
0fd379bbda
Added missing 't' from the end of the /images/{{id}}/get eg.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 4352ea7b0a746f00c29fb1170e893242cb8612ef
Component: engine
2014-09-16 15:27:44 +10:00
7a508b61c2
Merge pull request #8013 from unclejack/fix_testimportdisplay
...
integ-cli: fix TestImportDisplay & add FileServer
Upstream-commit: 0954fb32a4a39735a5fc6e402b1659ee3ba0d1cb
Component: engine
2014-09-15 22:36:51 -06:00
cd4d60a084
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
a7a415757f
Merge pull request #8034 from michaljemala/patch-1
...
The default name of the bridge created is called 'docker0'.
Upstream-commit: 023241614efbbf143041f261df969bed6fc7f645
Component: engine
2014-09-15 17:32:57 -07:00
9a9cc402da
Help new users if their SELinux is not-upgraded yet.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a3f51da98adf27d1f312edac04f0f9863019a8e8
Component: engine
2014-09-16 10:18:50 +10:00
1e452211b4
Merge pull request #8036 from unclejack/kernel_version_requirement
...
docs: change kernel version requirement
Upstream-commit: 2f65ed0968a5a3630872b4e94ed0f347945b4a8f
Component: engine
2014-09-16 10:14:02 +10:00
1bc2448cc5
Merge pull request #8037 from unclejack/shrink_docs_images
...
docs: shrink images
Upstream-commit: 62b86613e8c6bb8fa1c50fd30a92c050ffbed88e
Component: engine
2014-09-16 10:13:03 +10:00
86091bac44
integ-cli: fix TestImportDisplay & add FileServer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9e5592d6a10ce02fb77244c7de3fff38958e0b89
Component: engine
2014-09-16 01:54:21 +03:00
c472fc422b
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 985fae256f3fcaea5cf67581ae3d83a46bc52d9e
Component: engine
2014-09-15 15:17:50 -07:00
1849466b73
Merge pull request #8049 from unclejack/fix_tag_validation
...
graph: validate tags properly & add unit tests
Upstream-commit: 09982d0f975cfc302fb12f22905673546ef40cd7
Component: engine
2014-09-15 14:32:02 -07:00
fc234a85d7
graph: validate tags properly & add unit tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: ada883b198aa5e7a42d344174dcec04933c6fb2a
Component: engine
2014-09-16 00:13:54 +03:00
bd606a30d9
Merge pull request #8023 from nerab/patch-1
...
Append instead of replace file contents
Upstream-commit: 4b0bb716270bab57714c54ac12f295345263fc54
Component: engine
2014-09-15 13:54:41 -07:00
9a18f893c7
tarsum: version the addition of xattrs
...
Now that TarSum can be versioned, move the addition of xattr headers in
to the next version of TarSum
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0ecafb8a6909f5d342246aefb9ac97350cef6558
Component: engine
2014-09-15 16:08:05 -04:00
ecad7daa7e
Merge pull request #8005 from SvenDowideit/document-sshd-env-vars
...
Document how to pass ENV vars to the user's shell
Upstream-commit: c89242320915c465d3c5d5feae78a175a43bd356
Component: engine
2014-09-15 12:44:56 -07:00
6920f6eb53
Merge pull request #8044 from brahmaroutu/container_copy_6107
...
Change the copy command Content-Type header to x-tar
Upstream-commit: fd501d4b3ae8ce1be631bcf9e00333ba75667dfa
Component: engine
2014-09-15 12:06:48 -07:00
52ac5025c9
tarsum: include xattr headers in to the checksum
...
this is to enhance the tarsum algorithm, but _MUST_ be done in lock step
with the same for docker-registry. (PR will be cited)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 448c8ecb0fb453bb29fcada5e7486355ccfadbe9
Component: engine
2014-09-15 15:05:01 -04:00
3da88c8c53
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
Upstream-commit: fbae71326ccc24f6be720f64e0ea48c59376452b
Component: engine
2014-09-15 23:03:30 +04:00
084a5b1c3f
Change the copy command Content-Type header to x-tar
...
Addresses #6107
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 788e4acaa3883bc7369f9462f107266b41c59746
Component: engine
2014-09-15 10:45:06 -07:00
8ef9f79072
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 31c0039022234972c79947a6299c0fa382436487
Component: engine
2014-09-15 16:01:23 +03:00
560885c335
Merge pull request #7698 from tamsky/tune2fs_base_filesystem
...
use tune2fs to disable ext4 mount counts and mount intervals
Upstream-commit: a10a86d437148fe93c0ad128a233f42b17b22700
Component: engine
2014-09-15 15:42:52 +03:00
883914aefd
docs: change kernel version requirement
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 0619512582bada62681816e6cb9cdfe01bf2fdec
Component: engine
2014-09-15 15:15:55 +03:00
c3fe53e47f
docs: shrink images
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 90dcc7c8405437a10b81e932b49a856502cee626
Component: engine
2014-09-15 14:46:29 +03:00
df653eaf4f
The default name of the bridge created is called 'docker0'.
...
Upstream-commit: 140229677af2cf4865424e535b06440f043e163b
Component: engine
2014-09-15 12:10:46 +01:00
eb7e1f51d1
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
Upstream-commit: c751e1739d56e38aa9a813c369d78c6dbdc37b07
Component: engine
2014-09-15 13:54:29 +03:00
b39b11e4fc
Merge pull request #8028 from SvenDowideit/ekristen-patch-1
...
HTTP Status 201 not 200
Upstream-commit: 0658be89d0d8b623ba9738eb25e78b666d33b34e
Component: engine
2014-09-15 11:00:05 +10:00
5d83fcb509
HTTP Status 201 not 200
...
The http status should be 201 not 200.
Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com > (github: SvenDowideit)
Upstream-commit: c4db3b8075ab4b8bd0c6599cb19e09eb77c82946
Component: engine
2014-09-15 10:58:45 +10:00
fb75c62292
Merge pull request #8008 from dwgebler/master
...
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 0c5a7ad577a0525419e009884ef5e2f0d095d11c
Component: engine
2014-09-15 10:51:38 +10:00
a1ea7562ca
Append instead of replace file contents
...
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
Upstream-commit: 81357e12e7a019c14d87dc491705ad92409293b7
Component: engine
2014-09-13 22:26:40 +02:00
d8cb453d89
Allow /etc/hosts and /etc/resolv.conf to be updated both outside and
...
inside the container.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 09b700288e4804162ef86c99466e08b6b016e0c4
Component: engine
2014-09-13 11:27:34 -07:00
3fd5e4c058
Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
...
tarsum: TarSum should be the interface
Upstream-commit: 23f490427f80f6b48f19767cbebb10ddff6997f3
Component: engine
2014-09-12 17:01:35 -04:00
921f58e1dd
Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
...
Ensure container names start with a-zA-Z0-9
Upstream-commit: da4dba2e8c9866219ad99308d2d503a5aae634ec
Component: engine
2014-09-12 23:15:16 +03:00
439e5d1e9a
Merge pull request #8004 from duglin/Issue6447
...
Fix parsing of proto/port - issue 6447
Upstream-commit: 63a15486882e1dad12e427737fd150194be6c511
Component: engine
2014-09-12 12:00:57 -07:00
4d322385b8
Fix parsing of proto/port
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 658a9d0f471b903035869ffadece5806768ab690
Component: engine
2014-09-12 11:39:14 -07:00
7af7544c23
Merge pull request #7934 from LK4D4/fix_double_allocation
...
Fix error propagation from userland-proxy
Upstream-commit: a96811272a7fbc695a1c3cc9931bb8b9f784978e
Component: engine
2014-09-12 11:39:10 -07:00
a8bfc34d1d
Ensure container names start with a-zA-Z0-9
...
Closes #8012 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: aa2af817bee123827f4a857555db8fea5e01e7d7
Component: engine
2014-09-12 10:45:07 -07:00
0e0922f67a
Merge pull request #7986 from abh1nav/master
...
Update remote_api_client_libraries.md
Upstream-commit: 64ecef59af2d5befd5624f3eb73e9ff16d827c55
Component: engine
2014-09-12 10:37:00 -07:00
9a7a429b7a
Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
...
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
Upstream-commit: 1501adad29bee6ebb40589a08b6374374d7c3fbf
Component: engine
2014-09-12 10:35:30 -07:00
990ce2ca68
docs/reference/api: fix typo in docs
...
Signed-off-by: Francisco Souza <f@souza.cc >
Upstream-commit: fe5b72e7bb4f7c043409196cb98d46796f2dc390
Component: engine
2014-09-12 13:57:43 -03:00
797acb46eb
Merge pull request #8009 from unclejack/better_run_test_debug
...
integ-cli: better debug output for run & import
Upstream-commit: a612d859165d297287164be30bfab4e676f1369c
Component: engine
2014-09-12 18:38:46 +04:00
35e640c370
integ-cli: better debug output for run & import
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 3ec564bfda57f068aac813f4b985385c1c7e4f23
Component: engine
2014-09-12 16:51:21 +03:00
92ab71ec69
Merge pull request #7998 from duglin/Issue5701
...
Add notes about single-quotes (for issue 5701)
Upstream-commit: b6b85a58fd0455f2655219706e6061a5847b21b7
Component: engine
2014-09-12 07:41:31 -04:00
23359870fc
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 78fe117076289695ab03c90d266c47438ab8db7a
Component: engine
2014-09-12 11:04:40 +01:00
1a0325cec5
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
2014-09-12 11:45:50 +04:00
7af74b4383
Use unlocked version of changes for GetImage
...
Fixes #7999
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 82bdd88e9c9db40ee8072f7c4c2832dfb3f73823
Component: engine
2014-09-12 11:44:51 +04:00
