Jessie Frazelle
3c9757aaf8
Merge pull request #9400 from emilymaier/9389-fix
...
Fixes race condition in test. Closes #9389 .
Upstream-commit: 19844140d338bae8cc56ab0f3318a613859581ea
Component: engine
2014-11-28 21:02:52 -07:00
Fred Lifton
ce7b0568fe
Merge pull request #9227 from SvenDowideit/add-client-ip-to-hosts
...
Add an example of how to add your client IP to the container hosts file
Upstream-commit: 2c97cc39958ab9e4d1432836a9e925dd03e87fad
Component: engine
2014-11-28 17:44:11 -08:00
Fred Lifton
d9b29f9a8d
Merge pull request #9337 from shishir-a412ed/deprecated-images-t-v
...
Removing description for 'docker images' -t and -v flags, since they are deprecated.
Upstream-commit: 11069f257f8169c1774e025fe9ffd6447dd1b900
Component: engine
2014-11-28 17:35:36 -08:00
Fred Lifton
2237d8acc8
Merge pull request #9347 from SvenDowideit/extract-systemd-docs
...
Extract the systemd docs from various places and add a little more
Upstream-commit: 6a4d4fb2f5f93b37d99f66f8190fe89cf2ad5f89
Component: engine
2014-11-28 17:12:00 -08:00
Emily Maier
154f28d3d7
Fixes race condition in test. Closes #9389 .
...
Signed-off-by: Emily Maier <emily@emilymaier.net >
Upstream-commit: 9c5e61c24c490ca3e9d52855ee26d4a8e9032fb2
Component: engine
2014-11-28 13:48:50 -05:00
James Turnbull
5d5bf9faad
Merge pull request #9285 from therealprologic/update-crux-docs
...
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 4083fa26208fe4a1b78cad9ab85cdbb50293cedd
Component: engine
2014-11-27 02:36:05 -05:00
Sven Dowideit
bb2a1e68cf
Add an example of how to add your client IP to the container hosts file
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 54050083d1c65d4e7a90371c78c587819df27d2f
Component: engine
2014-11-27 16:36:55 +10:00
James Turnbull
6915edc6f0
Merge pull request #9329 from acbodine/9296-dockervolume-doc-mount-behaviour-fix
...
Closes #9296 adds a more detailed note about the mount behavior with -v ...
Upstream-commit: 07e9ea86ca45313018eb1bc8c959ae17867fabb1
Component: engine
2014-11-27 00:22:19 -05:00
James Turnbull
ffe0d333fd
Merge pull request #9359 from bfirsh/update-note-format-in-docs-style-guide
...
Update format of notes in docs style guide
Upstream-commit: d3707a94114288344bede715989e5221ff6e0a8f
Component: engine
2014-11-26 22:39:31 -05:00
James Turnbull
ceb1c8dfdb
Merge pull request #9368 from msteinert/builder-md-typo
...
Fix a small typo
Upstream-commit: 9e56c614a160957fa7cd2da91b45780bb3dbaf45
Component: engine
2014-11-26 22:39:19 -05:00
Sven Dowideit
8ca77e6e26
Merge pull request #9282 from SvenDowideit/explain-VIRTUAL-SIZE
...
Explain what the VIRTUAL SIZE means
Upstream-commit: ff327f9d576fea42713e88a6a50ef2a3f47d219f
Component: engine
2014-11-27 12:19:09 +10:00
Sven Dowideit
1d30429df6
Explain what the VIRTUAL SIZE means
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 498f208ade18dffb7362adc37c1f11b1bff187da
Component: engine
2014-11-27 12:06:40 +10:00
Fred Lifton
a849101a28
Merge pull request #9275 from jfriedly/userguide-typos
...
Fix typos in the user guide main page
Upstream-commit: ec07bb48fc819e741775d9440be69b7679eae5ae
Component: engine
2014-11-26 17:03:59 -08:00
Sven Dowideit
be6e29bd97
Extract the systemd docs from various places and add a little more
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: d53b586ff1b274b529b7912df3052a1bc2ca8dfe
Component: engine
2014-11-27 10:17:46 +10:00
Alexander Morozov
ca3f79cbd3
Merge pull request #9366 from yoheiueda/increase-memory-limit
...
Increase memory limit in integration-cli test cases
Upstream-commit: 9974fce28a6aea81f8ea8c43a782d9940822d724
Component: engine
2014-11-26 12:09:39 -08:00
Jessie Frazelle
b1dc744a56
Merge pull request #9367 from jfrazelle/no-windows-for-you-yet
...
Windows should not be in "official release" yet
Upstream-commit: 6d171c5340adf3f311c830d8900f75741521bbe9
Component: engine
2014-11-26 11:59:21 -08:00
Jessica Frazelle
bc16e560f9
Windows should not be officially released.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 750dc335a983fcd2c1410bffe5e23d1b0b3c3e3c
Component: engine
2014-11-26 11:50:07 -08:00
Vincent Batts
7b6399d928
Merge pull request #9006 from snitm/thin-pool-improvements
...
Thin pool improvements
Upstream-commit: b47ff77b5ce852bd830bc617d1c4e2c37e346281
Component: engine
2014-11-26 14:44:09 -05:00
Michael Steinert
b9f89e5866
Fix a small typo
...
Signed-off-by: Michael Steinert <mike.steinert@gmail.com >
Upstream-commit: 8b881df9b1f3c8fa7c36dd5b2fb3e7235f6d4654
Component: engine
2014-11-26 13:09:44 -06:00
Yohei Ueda
cd036c2490
Increase memory limit in test cases
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com >
Upstream-commit: 64fd3e89c7f6164b5522b5e611e7daf4a2bdae9c
Component: engine
2014-11-27 03:22:16 +09:00
Ben Firshman
0f87ed0f58
Update format of notes in docs style guide
...
It seems like all of the notes in the docs are this format.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 12bc51603bddac886363756d550ab79a53bcac8f
Component: engine
2014-11-26 15:15:10 +00:00
Michael Crosby
01d2e4019d
Merge pull request #9346 from jfrazelle/fix-events-test
...
fix tests where cmd function does not exist
Upstream-commit: 75b47467aa81b203f565eef7a182f0f805d0f812
Component: engine
2014-11-25 18:53:08 -08:00
Jessica Frazelle
484c26692a
fix where cmd function dne
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 8635b0248a1166a48dbd0fbe32df7b19f4ccea62
Component: engine
2014-11-25 18:34:08 -08:00
Jessie Frazelle
3253386751
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
2014-11-25 18:03:51 -08:00
Jessie Frazelle
039ddfff8b
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
2014-11-25 17:52:27 -08:00
Doug Davis
c28ef478d3
Add support for docker exec to return cmd exitStatus
...
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.
Closes #8703
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
2014-11-25 17:49:25 -08:00
Michael Crosby
25cbd8f774
Merge pull request #8767 from erikh/update_parents_hosts_part2
...
Links test cleanup
Upstream-commit: 6a0177ed2e760bc3298eb6dbc28d325ab2e353bc
Component: engine
2014-11-25 17:17:35 -08:00
Vincent Batts
326fa034ea
Merge pull request #9279 from yoheiueda/termios-via-cgo
...
Use termios via CGO
Upstream-commit: 79064a28203496c8f63510e73c32a7135f456a27
Component: engine
2014-11-25 20:04:26 -05:00
Erik Hollensbe
2d3f0f7b70
Test for updating hosts files via links.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 68bc8de111e4faa2a16583cd45b5c0fd253a3bba
Component: engine
2014-11-25 16:48:36 -08:00
Erik Hollensbe
8137d7940d
Break some routines out of the mutable files test for future use
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 20575d20bad60172b9d1f40c9fe357b7c069f466
Component: engine
2014-11-25 16:46:09 -08:00
Michael Crosby
826090bed0
Merge pull request #9030 from cpuguy83/cleanup_host_parser
...
Cleanup ParseHost
Upstream-commit: 1eb5e5d25faac6ef175285fb8606484928309802
Component: engine
2014-11-25 16:15:48 -08:00
Victor Vieux
267eaf906b
fix tests
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f0f0e316aab2c8cc6e2f0124c7bde7661a15461c
Component: engine
2014-11-26 00:00:56 +00:00
Brian Goff
77c62b2fac
Cleanup ParseHost
...
Current implementation is comingling things that ought not be together.
There are _some_ similarities between parsing for the different proto
types, but they are more different than alike, making the code extremely
difficult to reason about.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: bd4fe9b9867c7633e520130b99e02798f49e6b44
Component: engine
2014-11-25 18:55:40 -05:00
unclejack
a05c63f99c
Merge pull request #9342 from unclejack/add_tarsum_maintainers
...
pkg/tarsum: add maintainers & add missing s
Upstream-commit: 1dadc51adc9f8d20c4e1d20c120dfe253b61b99c
Component: engine
2014-11-26 01:45:51 +02:00
unclejack
fb0b016635
pkg/tarsum: add maintainers & add missing s
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3db5ea1617549bbef7f645d4ecbf482ad1f31c71
Component: engine
2014-11-26 00:44:16 +02:00
Michael Crosby
b58a35f8fe
Merge pull request #9262 from rhatdan/debug
...
Allow developers to build docker with debuginfo included
Upstream-commit: 93be7c0e52894dcb7a71196a699f41bb24395d8e
Component: engine
2014-11-25 14:21:00 -08:00
Shishir Mahajan
fd80c33b84
Removing description for 'docker images' -t and -v flags, since they are deprecated
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: b4b962444765ea76457465000f42d1a52021020e
Component: engine
2014-11-25 14:11:13 -05:00
Dan Walsh
9576e39bda
Merge branch 'master' of github.com:docker/docker into debug
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 61586414ca227f7c61395ccf9605f5ceece54399
Component: engine
2014-11-25 14:09:19 -05:00
Jessie Frazelle
75c1310aa4
Merge pull request #9238 from albers/bash-completion
...
Add missing options to bash completion for the run and create commands
Upstream-commit: 7ebcdad03043a5cb423aaecbc7932fea76a2f7db
Component: engine
2014-11-25 09:27:31 -08:00
Yohei Ueda
fb15ffbdaa
Use termios via CGO only on Linux
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com >
Upstream-commit: dfcf05a5d070823ade84ffba0e9784cdfe6d54b0
Component: engine
2014-11-25 20:49:01 +09:00
Harald Albers
f439fe36a4
Minor bash completion cleanup
...
The -n and --networking options were removed because they are
unsupported.
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: eac9f2e5c4fa47b0ef1e064ac2bc62be6f3a3c99
Component: engine
2014-11-25 08:53:13 +01:00
Harald Albers
3701f3bcf6
Add missing options to bash completion for the run and create commands
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2e863e8a3849f6ea34dd281aac6f8a6c700bf029
Component: engine
2014-11-25 08:53:12 +01:00
Andrew C. Bodine
e165ded13e
Closes #9296 adds a more detailed note about the mount behavior with -v flag
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: efb8e8a34550b80a567e7b69ad6bb2644d5a9b09
Component: engine
2014-11-24 23:41:49 -08:00
Jessie Frazelle
aba2469af0
Merge pull request #9224 from tianon/custom-debootstrap
...
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
Upstream-commit: 27127437a6249bbf6f70707ff681992eb00ac47b
Component: engine
2014-11-24 18:11:59 -08:00
Mike Snitzer
c836e22634
devmapper: cleanup some extraneous branching in setupBaseImage()
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: b9f1b0a7514c6e40e7048fb9206001259eb7c33c
Component: engine
2014-11-24 20:06:41 -05:00
Tibor Vass
cfc5b3b8df
Merge pull request #9325 from unclejack/add_1.3.2_relnotes
...
docs: Add 1.3.2 release notes
Upstream-commit: 498985a0398eccafaf2e2f2668a469386e3780f1
Component: engine
2014-11-24 20:06:34 -05:00
Tibor Vass
0e537abc04
docs: Add 1.3.2 release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 4dd3368b51b2b00936f91fcc951d81d0c0d918ae
Component: engine
2014-11-25 03:02:27 +02:00
Tibor Vass
ed716fd8a8
Merge pull request #9323 from unclejack/merge_release_v1.3.2
...
Merge release v1.3.2 to master
Upstream-commit: e6ec703df31f04c3ea3a6aeb19881494a6ae58ae
Component: engine
2014-11-24 19:26:36 -05:00
Jessie Frazelle
bb7432e3f1
Merge pull request #9324 from crosbymichael/git-urls
...
Move IsGIT and IsURL to urlutil package
Upstream-commit: 2ad98b0cfa355901d345ab361160439b1a283971
Component: engine
2014-11-24 16:07:42 -08:00
Tibor Vass
f5cd7e9948
Add v1.3.2 changelog & bump version to 1.3.2-dev
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: b21e1d4a00f2687ef24aa47039ac2f0281294365
Component: engine
2014-11-25 02:07:01 +02:00