ab2da9516a
Merge pull request #11939 from jfrazelle/fix-go1.3.3
...
fix basicAuth function not in go1.3.3
Upstream-commit: e2d96d43040cb183fcf897cae48b40193e6d03d8
Component: engine
2015-03-30 16:51:42 -07:00
208b0b8235
Merge pull request #11904 from albers/completion-filters
...
Add missing filters to bash completion for docker images and docker ps
Upstream-commit: 1ce39e234c815dc7416d644a02c166725fa1d8f6
Component: engine
2015-03-30 16:37:01 -07:00
595da7af33
Merge pull request #11938 from achanda/patch-1
...
Remove unused daemon.LogToDisk function
Upstream-commit: 2742bf5cbc2d7b8141f527f1e9e1014fdce328b2
Component: engine
2015-03-30 15:48:03 -07:00
127f29ac8e
fix basicAuth function not in go1.3.3
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Upstream-commit: 4a2ef6c8053d5b0eb768297af8609505198c7187
Component: engine
2015-03-30 15:28:34 -07:00
fa379f41d2
Merge pull request #11936 from runcom/11935-remove-duplicate-assignment
...
Remove duplicate assignment
Upstream-commit: 69b84c5be9f7ef00166a50800786058092d58cbc
Component: engine
2015-03-30 15:16:11 -07:00
fe4221a719
Remove unused daemon.LogToDisk function
...
Fixes #11937
Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com >
Upstream-commit: 1d23bae785ce8c94227def97b673307e1743db88
Component: engine
2015-03-30 14:54:17 -07:00
f91badaa49
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: cc46ae8eaef2ce441e5f35412c4ee6ccbb65c2de
Component: engine
2015-03-30 23:07:43 +02:00
dfa22e2d7b
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
Upstream-commit: fe9f3227b18504add673b9c62669032c3f17e726
Component: engine
2015-03-30 13:53:09 -07:00
f6752519af
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
Upstream-commit: 00a15227f8c7679a4a5c1f90e61367a3d1be92df
Component: engine
2015-03-30 13:35:40 -07:00
0fa6cf44f7
Merge pull request #11896 from vdemeester/9998-cp
...
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
Upstream-commit: b6d6ffa1dd7172ba6e5f2eb8adf1626a6ee47a01
Component: engine
2015-03-30 13:15:00 -07:00
f3f4c403c1
Merge pull request #11900 from runcom/11899-refactor-utils-http
...
Refactor utils/http.go
Upstream-commit: 70a479dda5e2f99ac141853c2a8527a026c1da6f
Component: engine
2015-03-30 13:11:45 -07:00
bf3cebd134
Merge pull request #11931 from scarletmeow/11563_log_timestamp
...
Upgrade logrus to v0.7.2
Upstream-commit: a7a93fd2b22d70e063e0ec12dc0e5365238bc682
Component: engine
2015-03-30 13:09:17 -07:00
8eda4a7396
Merge pull request #11869 from dmcgowan/v2-push-gzipped
...
Compress layers on push to a v2 registry
Upstream-commit: 72dfd6728fdba7b2a74d3a51de12806d2ec02697
Component: engine
2015-03-30 12:58:55 -07:00
7fd0208ff7
Upgrade logrus to v0.7.2
...
- Daemon logs now report to millisecond resolution
Signed-off-by: Tiffany Low <the.second.angel@gmail.com >
Upstream-commit: 711e580320a5da5cb33e8f03a17d355b4fb127c1
Component: engine
2015-03-30 12:27:03 -07:00
fce72f0ec0
Compress layers on push to a v2 registry
...
When buffering to file add support for compressing the tar contents. Since digest should be computed while writing buffer, include digest creation during buffer.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 851c64725d0b1b37e51fa0d0df744bbe82ad4c7b
Component: engine
2015-03-30 12:15:15 -07:00
488df4812a
Merge pull request #11901 from albers/dockerfile-bash-completion
...
Enable bash completion in build environment
Upstream-commit: f3a048516eaef7c8438446dc2e045bf4b306c8b0
Component: engine
2015-03-30 11:52:43 -07:00
5cc2101a16
Merge pull request #11928 from crosbymichael/aufs-build-errors
...
Fix AUFS logrus build errors on import
Upstream-commit: 446437d1a1b4d9f372768e954d36c4df64cc657e
Component: engine
2015-03-30 11:49:14 -07:00
e54d4e4dac
Fix AUFS logrus build errors on import
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d1306e63e478cf8fb7ee093c828763e27a5b0cc9
Component: engine
2015-03-30 11:46:44 -07:00
f45f722875
Merge pull request #11890 from albers/completion-run-cgroup-parent
...
Do not complete --cgroup-parent as _filedir
Upstream-commit: a0d90f18d5aac73c76c64c7d25a82b5b8d3eb3e2
Component: engine
2015-03-30 12:42:30 -06:00
d7e9f5fdd9
Merge pull request #11799 from dqminh/aufs-dirperm1
...
aufs: apply dirperm1 by default if supported
Upstream-commit: 14fed352cbb29232af1644e49e019da897a44de6
Component: engine
2015-03-30 11:36:02 -07:00
0c97147fbc
Merge pull request #11894 from ankushagarwal/11630
...
Explain --net=host option usage
Upstream-commit: 3a706d65808948f6fce6c090cdff849efa49332a
Component: engine
2015-03-30 11:18:01 -07:00
5ba38993bc
Explain --net=host option usage
...
Fixes #11630
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
2015-03-30 10:28:44 -07:00
c8f2957077
Merge pull request #11898 from unclejack/broadcastwriter_writestring
...
pkg/broadcastwriter: avoid alloc w/ WriteString
Upstream-commit: 924d503cb1937ed4fb8bfcad6beea0c85595a8b9
Component: engine
2015-03-30 09:28:08 -07:00
a62098f98e
Refactor utils/http.go, fixes #11899
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 0995ab5946b068a14cba05be8b2693c4181097e3
Component: engine
2015-03-30 17:59:57 +02:00
5bc802bd5b
Merge pull request #11906 from runcom/11905-refactor-utils-tmpdir
...
Refactor utils/tmpdir.go
Upstream-commit: a2ea4a9d9de48eebbeeb80acfdc6ce82f6052365
Component: engine
2015-03-30 08:58:51 -07:00
0d506f107a
Merge pull request #11888 from jamiehannaford/commit-cmd-struct
...
Use ContainerCommitResponse struct for Commit cmd
Upstream-commit: a27057d7796fc29c51518f1cb7440d05bb198c6f
Component: engine
2015-03-30 08:20:32 -07:00
bdbfad228d
Merge pull request #11913 from sunyuan3/docker_cli_restart_test
...
Verify MaximumRetryCount=0 if the restart policy is always.
Upstream-commit: 5ab98eae3c3ef7b1c7ae703294188387874dcaca
Component: engine
2015-03-30 10:05:08 -04:00
223acfb4f9
Merge pull request #11912 from sunyuan3/typo
...
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
Upstream-commit: d95fae062bf488014ac2a014a4d2832e2de93207
Component: engine
2015-03-29 21:59:50 -04:00
6052094333
Verify MaximumRetryCount=0 if the restart policy is always.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: f5310f403da573e28477e142e5f70efe0045b323
Component: engine
2015-03-30 09:08:33 +08:00
8b07e2892d
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 08331294bcabf90ce3d22dca729f206912d2a752
Component: engine
2015-03-30 08:31:46 +08:00
6b249811ef
Merge pull request #11678 from botchagalupe/docker-11465
...
Closes #11465 - Add additional doc for local registries on pull command
Upstream-commit: 41e47bbf34aa815fbc4fcec1247606b684bb9061
Component: engine
2015-03-29 14:10:20 -07:00
e6d4577421
Merge pull request #11798 from amylindburg/11792-fix-typo
...
Fixing typo in cd instruction
Upstream-commit: 4edf8e1e530fc0e4ff94cfce4600480680ea4458
Component: engine
2015-03-29 14:01:35 -07:00
c36fcf41dd
Merge pull request #11897 from ankushagarwal/glossary
...
Add Glossary to documentation
Upstream-commit: 3bf98692347a72977b9f0e2d7ac8a1d5811ba5d3
Component: engine
2015-03-29 13:49:22 -07:00
1e3a3c6a81
Merge pull request #11885 from bobrik/fix-formatting
...
Fixed code formatting on docs.docker.com
Upstream-commit: 8b3d8f21a07593fb97fb7cf7005931cb14806bba
Component: engine
2015-03-29 13:21:26 -07:00
291fe357b5
Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows
...
Update Documentation for Windows Installation
Upstream-commit: 3ff71c24c17726dd818c46aea9614b27b527156f
Component: engine
2015-03-29 13:18:00 -07:00
82aa49d3e7
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
...
Add a integration test TestCpSpecialFiles
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8bc330d8632ef0129b433b877a5e2fc88bb2eb39
Component: engine
2015-03-29 22:10:14 +02:00
77651137b6
Merge pull request #11870 from dekobon/master
...
11558 - Documentation fixes and improvements for Riak Dockerfile
Upstream-commit: 584df44d424b0a884782bf7a9218a5a9473fe12d
Component: engine
2015-03-29 12:42:54 -07:00
a0e1171855
Add Glossary to documentation
...
Closes #11057
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 567f723721b7bac57a91d82d27472e568a101c4f
Component: engine
2015-03-29 12:24:54 -07:00
342d42b5a5
Refactor utils/tmpdir.go, fixes #11905
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: f1bbc1f34f98529f352130b5985ae5763e5b9c2e
Component: engine
2015-03-29 20:56:07 +02:00
90f64b3b18
Add missing filters to bash completion for docker images and docker ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cf438a542e76279715dc7d414a11845725044e90
Component: engine
2015-03-29 10:13:47 -07:00
4c2d9f8cc3
Merge pull request #11880 from miwest929/feature/add_man_pages_docs
...
Feature/add man pages docs
Upstream-commit: 1f27ebc2c79becebe489f555ff02cef93a2b16be
Component: engine
2015-03-29 09:39:56 -07:00
e69b047ff4
Enable bash completion in build environment
...
Installs and configures bash completion for Docker.
Note that bash completion still has to be initialized by a custom
.bashrc file.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e8edcf47b4b495070a3a3db7b2faeef91adf83f9
Component: engine
2015-03-29 06:50:46 -07:00
78bf03cec8
pkg/broadcastwriter: avoid alloc w/ WriteString
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: db877d8a425a3c063eedb1908ab1b50df1a33a57
Component: engine
2015-03-29 15:20:53 +03:00
0f80e9e5da
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
2015-03-29 03:22:46 +02:00
eee97805d1
Do not complete --cgroup-parent as _filedir
...
This is a follow-up on PR 11708, as suggested by tianon.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a09cc935c3531e0132640f0fe258041f1b445fdc
Component: engine
2015-03-28 11:32:33 -07:00
1bfc9627bf
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 8b795a05a8fa8a6f747ee5cc0c087bca9d42199d
Component: engine
2015-03-28 17:55:45 +01:00
3e352e0688
fixed code formatting on docs.docker.com
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com >
Upstream-commit: 0dc996a7d779100b44e5c6f492efe231140d76cf
Component: engine
2015-03-28 14:32:53 +03:00
d8bff85dcd
Merge pull request #11281 from coolljt0725/fix_ipc_from_non_exist_container
...
Fix error from daemon no such image even when the image exist
Upstream-commit: 61069d8b69a62a3325a54833dfde70d4f30d2e1c
Component: engine
2015-03-28 06:58:48 -04:00
9d0d13f217
Add nice error message
...
Generally, when using Remote API to push images there needs a http Header
X-Registry-Auth.
For compatibility if there was no authConfig header, everything will be
okay if a proper JSON-http-body was applied.
But when both X-Registry-Auth Header and the Body are missing, due to
the function of decode JSON, it will return an EOF error which was not
very clear to user.
So I think we can make the respone error be more nice.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: cee62a95a2086dace52f2492de781aa333abca3b
Component: engine
2015-03-28 16:27:30 +08:00
1a8787e1e6
Add a missing definite article
...
Signed-off-by: Michael West <mwest@mdsol.com >
Upstream-commit: b4905859d55cf756d3855c1deddb68a9509bdab4
Component: engine
2015-03-27 23:35:37 -04:00
Michael Crosby
Jessie Frazelle
Alexander Morozov
Jessica Frazelle
Abhishek Chanda
Antonio Murdaca
Tiffany Low
Derek McGowan
Michael Crosby
Tianon Gravi
moxiegirl
Ankush Agarwal
Doug Davis
Yuan Sun
Vincent Demeester
Harald Albers
unclejack
Jamie Hannaford
Ian Babrou
Phil Estes
Hu Keping
Michael West