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
3cecae722e
Fix create volume in a directory which is a symbolic link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7583b491250beac9caeeac13b7b68c4e0f03eb60
Component: engine
2015-03-29 13:35:36 +08: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
93a82de971
Add man pages generation instructions.
...
Signed-off-by: Michael West <mwest@mdsol.com >
Upstream-commit: f7d75cc08a6ebdc50ea9b7473342fdf6e22dc848
Component: engine
2015-03-27 23:35:13 -04:00
3f29284d18
Remove dupllicated prefix to make table shorter & fix bugs
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: 194cad243ccf622c8ff048975e26cc6c51ccbf30
Component: engine
2015-03-28 01:49:28 +00:00
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +08:00
61cdd342d5
Merge pull request #11805 from runcom/11804-remove-err-field-job-struct
...
Remove err field from Job struct
Upstream-commit: 789a67e931d7ae251c88ce57ba2d9a8c6ff2f18d
Component: engine
2015-03-27 16:27:04 -07:00
0fa020686b
Merge pull request #11708 from coolljt0725/add_cgroup_parent_to_bash_completion
...
Add new docker run option to bash completion
Upstream-commit: e3b0014987664f8d675af2f72987c16e5733df48
Component: engine
2015-03-27 15:06:10 -07:00
0c7e99e9f0
Merge pull request #11852 from clnperez/doc-dev-container
...
Fix typo in doc at /set-up-dev-env
Upstream-commit: 221ff368df540bc2af259ad64455af8ac3394311
Component: engine
2015-03-27 15:03:36 -07:00
a44788dbfa
Merge pull request #11845 from lobatt/master
...
Issue #11836
Upstream-commit: c0884860931273ef26bc26fb7d97081b3ae2aaef
Component: engine
2015-03-27 14:55:04 -07:00
ae9c41e1ac
Update boot2docker on Windows documentation
...
Boot2Docker experience is updated now that we have a Docker
client on Windows. Instead of running `boot2docker ssh`, users
can also use boot2docker on Windows Command Prompt (`cmd.exe`)
and PowerShell.
Updated documentation and screenshots, added a few details,
reorganized sections by importance, fixed a few errors.
Remaining: the video link in the Demonstration section needs
to be updated once I shoot a new video.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: de09c553946943e9f4be5b3d0c4edf03b740ccf4
Component: engine
2015-03-27 14:54:37 -07:00
341fe64e6b
Add tool to conver disk image into Docker image
...
dockerize-image tool takes a virtual disk image file
and creates a Docker image based on it. You can
specify a base Docker image to make this tool create
an image that will contain only filesystem diff
instead of full filesystem.
See tools usage for details.
Signed-off-by: Maxim Kulkin <maxim.kulkin@gmail.com >
Upstream-commit: d1af2bc253f61a86c7d383ba3072c39e2a5b129d
Component: engine
2015-03-27 14:53:54 -07:00
cbbbdaca2d
Merge pull request #11853 from EricR/doc-PkgSysInfo
...
Add some basic doc for SysInfo
Upstream-commit: 7cc73607a274c8795a88bf711a8d8d2cdd154bab
Component: engine
2015-03-27 14:52:20 -07:00
35d3543e9d
Merge pull request #11871 from NinjaTrappeur/dry-run-test
...
Fix vet warning in devicemapper.
Upstream-commit: cc609c75560f39bfa2a34d2ea0e4be292d851954
Component: engine
2015-03-27 14:48:55 -07:00
3495bd3522
Merge pull request #11848 from duglin/CleanupIntTests
...
Clean up integration-cli tests
Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d
Component: engine
2015-03-27 14:11:56 -07:00
f19170b3d5
Merge pull request #11872 from ankushagarwal/11825
...
Replace fmt.Fprint* with io.WriteString
Upstream-commit: 37241db5f3e83d4a39a220c0eb2013a696d455f2
Component: engine
2015-03-27 14:05:15 -07:00
4f89fcb499
docs: remove unused windows images
...
These images was just sitting around and referenced from
nowhere, nor they seemed any useful.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 986ae5d52afe91da6f9e836f8e4ba2148b2c5193
Component: engine
2015-03-27 13:59:35 -07:00
98bfac2331
Merge pull request #11842 from brahmaroutu/events_tests
...
Events tests
Upstream-commit: 8c58bdd3a7d5aff31c446dfd6044c6e0d8afa7fb
Component: engine
2015-03-27 13:45:11 -07:00
7cb8e54ded
Replace fmt.Fprint* with io.WriteString
...
This fixes vet warnings in api/client/stats.go
Fixes #11825
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 6d21b2ba80e274e49d67e8f3d88bf9b3df567ff5
Component: engine
2015-03-27 13:08:20 -07:00
7ec8e95afe
Fix vet warning in devicemapper.
...
Issue #11828
Signed-off-by: Félix Baylac-Jacqué <baylac.felix@gmail.com >
Upstream-commit: 6b764bba8ad1c1006dadf24ec55edb9de200c706
Component: engine
2015-03-27 20:16:25 +01:00
6280a1894a
Added updated working Riak Dockerfile and documentation.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
Upstream-commit: de45aacc322445924710fc12ad6e2d9832c27c6e
Component: engine
2015-03-27 12:03:46 -07:00
0644b1baca
Removed references to creating an OpenSSH server. This method of accessing the Docker container is no longer needed now that the exec command is available.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
Upstream-commit: 31c50411574b19cb81b5f88c0f8ca4bb4a2ead83
Component: engine
2015-03-27 12:03:34 -07:00
0134fde659
Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
Upstream-commit: 17303b18b8813a184dadaacf63b10a419e476d07
Component: engine
2015-03-27 12:03:24 -07:00
10a440fbc6
Remove err field from Job struct, fixes #11804
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 60085e22ff9981bf26711295d12ea64ee29d85ea
Component: engine
2015-03-27 19:08:53 +01:00
e9805495bf
Update inline doc for New
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 3716df57c097803dec220ff95fffdae8394145fc
Component: engine
2015-03-27 13:55:22 -04:00
daae801e4a
Merge pull request #11850 from kytrinyx/11796-git-mental-model
...
Clarify git instructions in project guide. Fixes #11796
Upstream-commit: 121de9e4e3e781a9f43edb1b062beef9f9a9d6db
Component: engine
2015-03-27 09:02:03 -07:00
61457ac29a
Add capabilities list information table.
...
Signed-off-by: Chen Qiu <21321229@zju.edu.cn >
Upstream-commit: 89a29d7e99e57bcbcf87a7657070bfdf59d7b6ad
Component: engine
2015-03-27 08:45:36 +00:00
1c9316a817
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
Upstream-commit: da5c863d20df8c030b3ffc6c4e95f976ed162721
Component: engine
2015-03-26 23:55:50 -07:00
cce1904e9d
Add missing . in comment
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 6abe160eaec49c693b69d14304fe39d78ea4abb4
Component: engine
2015-03-26 23:22:05 -04:00
b0def5e5a0
Add some basic doc for SysInfo
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 01bbc3fbb9c3ab3dec0f271710739465b0f80b7a
Component: engine
2015-03-26 23:05:07 -04:00
4f989f959c
Use common code to test all events, when using filter that expect all lifecycle events.
...
Addresses: #10654
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: f5ad895ba624b6baddfa0c54a2da439b41b0535f
Component: engine
2015-03-27 02:47:46 +00:00
f047f87e51
Fix typo in doc at /set-up-dev-env
...
Save a whale!
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: dd6f988b23b56ce0ca17ab892143db53f1fa2f84
Component: engine
2015-03-26 21:46:35 -05:00
eb6bec8a3c
Clarify git instructions in project guide. Fixes #11796
...
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.
I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com >
Upstream-commit: 54c9ae187f5a3544881650c09e923d67ed229771
Component: engine
2015-03-26 19:24:14 -07:00
c6343683c9
Merge pull request #11846 from voltaic/master
...
Update set-up-dev-env.md
Upstream-commit: d2df901be3c5c964900de41286ba0c67aebfb5d1
Component: engine
2015-03-26 18:09:28 -07:00
34262a08d7
Merge pull request #11793 from lolilo/update-project-doc
...
fix typos, grammar, more concise wording
Upstream-commit: cd8ea1d17eff2424df6a63ef8de314e5724fd37a
Component: engine
2015-03-26 17:57:45 -07:00
5897cb3c81
Clean up integration-cli tests
...
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9a9d23dbc40c9b650bd1f9f98a421b7ff2312f36
Component: engine
2015-03-26 17:25:50 -07:00
29d7b5b844
Merge pull request #11841 from runcom/11762-replace-aliased-logrus-imports
...
Replace aliased imports of logrus
Upstream-commit: 756b8f2fde210da5529e0a5480e149917ab25524
Component: engine
2015-03-26 16:49:01 -07:00
99064ea4ea
Update set-up-dev-env.md
...
Signed-off-by: graycoder <patgray1127@gmail.com >
Upstream-commit: ddcb3ad061db518aa076422ed6d81a2247fb3a8e
Component: engine
2015-03-26 19:41:31 -04:00
ca8fb68336
Merge pull request #11813 from miminar/show-verified-status
...
Consider tag updated also in case repo does not exist
Upstream-commit: be5fd157d597b566f33de1bda19750313132239c
Component: engine
2015-03-26 16:29:13 -07:00
794638affe
Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix
...
term/winconsole: Identify tty correctly, fix resize problem
Upstream-commit: cf7104a0e853c453f08d052cb222b7071d4c27a2
Component: engine
2015-03-26 16:19:27 -07:00
