Erik Hollensbe
e1413bfc9f
builder: rewrote NewBuildFile according to tibor's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: bb36902db60d5d4e3b18bc018212e40df2d412e8
Component: engine
2014-08-27 18:52:29 -07:00
Erik Hollensbe
68301c3828
builder: parser and beginnings of the evaluator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 22c46af4b358cf3ec4f7af47c701064c00cf7de4
Component: engine
2014-08-27 18:52:29 -07:00
Fred Lifton
2fc0dfef18
Adding release notes to docs home
...
This is a temporary solution until we have a dedicated release notes page with automated content.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 1c3b732f8a6ed6f1d01a6ecacc6753899842c2f0
Component: engine
2014-08-27 18:34:19 -07:00
Erik Hollensbe
9d40e69de7
Update networking doc with clarified text regarding links usage
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: f6a2fc4c3370983043a4284be5d8a09c3ff3bb6e
Component: engine
2014-08-27 18:23:41 -07:00
Erik Hollensbe
31ac70b2be
pkg/networkfs/etchosts: tests for Update method
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 9f09ef18a44d6e14da3d8a60d923de9e38ffc33e
Component: engine
2014-08-27 18:23:41 -07:00
Erik Hollensbe
303526eefd
pkg/graphdb: tests for Parents and Children
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 925a3254e757407c5bfea5575df3b807f6596e70
Component: engine
2014-08-27 18:23:41 -07:00
Victor Vieux
ac32065d5c
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
Victor Vieux
98e2750389
remove auth_test.go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 2b538bd555b001e69346321485cd07a5c5c11d67
Component: engine
2014-08-28 00:28:54 +00:00
Victor Vieux
c2d0e99a2a
move TestEntrypoint & TestBindMounts
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 5b27fbc0e27358b794946fe9e84a83a6c4497be4
Component: engine
2014-08-28 00:25:10 +00:00
Victor Vieux
f434546a64
Merge pull request #7708 from SvenDowideit/programatic-usage-options
...
add the [OPTIONS] string automatically if there are flags defined
Upstream-commit: 96e1c99fb4b16c114f1d6c8cd9b541cc3e6fcf66
Component: engine
2014-08-27 16:40:17 -07:00
Victor Vieux
e59ed0e9b1
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb9379c5d05848c525f7c3d75b66a4b356227d57
Component: engine
2014-08-27 23:34:37 +00:00
Sven Dowideit
7217944ab6
Merge pull request #7766 from fredlf/update_b2d_upgrading
...
Updating B2D upgrade instructions for 1.2.0.
Upstream-commit: 7c27c7a09657ff482d3330ad74e92e4e36e5af21
Component: engine
2014-08-27 15:53:48 -07:00
SvenDowideit
3cca8404b4
add the [OPTIONS] string automatically if there are flags defined
...
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 8c6c4a12b7bd53c01998988593789aa16a6d9ac8
Component: engine
2014-08-28 08:50:50 +10:00
Victor Vieux
e054a664e8
Merge pull request #7762 from LK4D4/skip_delete_no_chain_#6904
...
Skip "no chain" error on deleting chain in Unmap
Upstream-commit: 0cb672e6a9ef1a0825f395db203fa675045f7844
Component: engine
2014-08-27 14:43:57 -07:00
Fred Lifton
c4216dda04
Updating B2D upgrade instructions for 1.2.0.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 3304d4e98479e54eb9580ce1c42adfb085cfa374
Component: engine
2014-08-27 14:16:29 -07:00
Michael Crosby
bc07761e2a
Merge pull request #7764 from vieux/revert
...
Revert "--help option and help command should print to stdout not stderr"
Upstream-commit: e0db426ff635f09df2f603caa7791e763bdb076d
Component: engine
2014-08-27 12:02:02 -07:00
Victor Vieux
676eea0fcd
Revert "--help option and help command should print to stdout not stderr"
...
This reverts commit 61b129d81802e3c988cc0e67e488b24968dd748a.
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 2e489073d94a7e2a5df115704a484c34f0b59f29
Component: engine
2014-08-27 18:59:13 +00:00
Hollie Teal
9ed3d21c9e
Added Fred's suggestions.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 77ca0ae9decbdcb8958c20f16d35ec34372b6efe
Component: engine
2014-08-27 11:49:26 -07:00
Michael Crosby
4d17a4b46d
Merge pull request #7686 from guywithnose/trancateNames
...
Truncate the names list on ps
Upstream-commit: 835800fcd5ac4b2f9a23f3e10b1fae76fb3d1cf8
Component: engine
2014-08-27 11:46:28 -07:00
Robert Bittle
8ae7b79e23
Truncate the names list on ps
...
Signed-off-by: Robert Bittle <guywithnose@gmail.com >
Upstream-commit: d2ffcd986f5e371fe39dc8d6b8c7390cfc4f305d
Component: engine
2014-08-27 14:24:49 -04:00
Victor Vieux
91ac365d86
Merge pull request #6052 from rhatdan/help
...
--help option and help command should print to stdout not stderr
Upstream-commit: 76fd51a4789c1af15d6682a01add3ff86df2f5cf
Component: engine
2014-08-27 11:17:16 -07:00
James Turnbull
d3b31ca9dc
Added Syntax highlighting file for the KDE Kate Editor
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 7458a82e0bbf4353729cfac3e1d7159b9d466161
Component: engine
2014-08-27 11:16:51 -07:00
Eric Windisch
94a36f4c63
Restrict repository names from matching hexadecimal strings
...
To avoid conflicting with layer IDs, repository names must
not be tagged with names that collide with hexadecimal strings.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 0bd1c05e5c36799e0740a155092be0c9c417f175
Component: engine
2014-08-27 13:46:10 -04:00
Alexandr Morozov
04c32fc20e
Skip "no chain" error on deleting chain in Unmap
...
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: bd049b3800b967bba06d03fd23ab135c51467ae3
Component: engine
2014-08-27 20:24:27 +04:00
Michael Crosby
0f8e8a7de5
Merge pull request #7740 from LK4D4/registry_style
...
Style fixes for registry/registry.go
Upstream-commit: 1385b2d2935c0d20e6406a80c62615a8c4cdbcc9
Component: engine
2014-08-26 18:02:11 -07:00
Brian Goff
054561d764
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 7495fbc0e3f23c932562cb02ea6e7df204d29dfa
Component: engine
2014-08-26 20:52:58 -04:00
Dawn Chen
d13bbe9188
Bump containervm version to the latest one: 20140826
...
Upstream-commit: 9cd77818bbf07ac5278f30f302d82af01243a5c9
Component: engine
2014-08-26 16:59:21 -07:00
Hollie Teal
24190e7f53
Final changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 161cc21f245cf05c6c2c168a6f5981989026e2cb
Component: engine
2014-08-26 14:01:10 -07:00
James Turnbull
16bdc5c32b
Merge pull request #7741 from LK4D4/bump_docs_to_1.15
...
Bump docs and api to 1.15
Upstream-commit: 4fe6115fb125d5acddec328e2dcfb23b6fe61ffa
Component: engine
2014-08-26 13:44:05 -07:00
James Turnbull
133de3a18a
Merge pull request #7735 from SvenDowideit/lxcconf-api-docs
...
Lxcconf api docs
Upstream-commit: 5b6c25f75192a75ff597470b3f6ba0981f6d3011
Component: engine
2014-08-26 13:43:48 -07:00
Michael Crosby
48ffeaab82
Merge pull request #7745 from LK4D4/fix_docker_host_panic
...
Fix panic for DOCKER_HOST without ://
Upstream-commit: b458dd1dfb9a105d65d1d5853408b200316b7275
Component: engine
2014-08-26 11:23:30 -07:00
Tibor Vass
b00ca614f6
Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904
...
Fix race condition between cleanup and Start
Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683
Component: engine
2014-08-26 14:17:11 -04:00
Michael Crosby
f5f64f68ea
Merge pull request #7642 from LK4D4/style_fixes
...
Style fixes for daemon package
Upstream-commit: 55f7dd8198549b704089a51662e3c511d028706c
Component: engine
2014-08-26 10:59:05 -07:00
Michael Crosby
ff69012bd1
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
2014-08-26 10:53:40 -07:00
Alexandr Morozov
62eb5165d1
Fix race condition between cleanup and Start
...
There was problem when Start might be before cleanup
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 12ff89a3901cd2debf13e7ccc3a1a780380e4dd9
Component: engine
2014-08-26 20:57:12 +04:00
Alexandr Morozov
fef7b9ee0d
Fix panic for DOCKER_HOST without ://
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 660cc4a2675d34695406b2506344a2a18f2a59e9
Component: engine
2014-08-26 20:32:10 +04:00
Tibor Vass
b029406e18
Merge pull request #7615 from crosbymichael/fix-utils-panic
...
Fix panic in validate context for build
Upstream-commit: 63ed18ad11a0ae563a3b75af4c6660e63667f896
Component: engine
2014-08-26 10:30:42 -04:00
Alexandr Morozov
b22bbbc6cc
Bump docs and api to 1.15
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
2014-08-26 13:08:50 +04:00
Alexandr Morozov
b5fb241c16
Style fixes for registry/registry.go
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 45a2923874a9b1f70674e627d0d112851d5982a8
Component: engine
2014-08-26 12:28:40 +04:00
Alexandr Morozov
6eedef59d9
Remove redundant elses
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 698392cb512ba0c85e69a669f115d67c1d50cb98
Component: engine
2014-08-26 09:28:54 +04:00
Alexandr Morozov
71bf8c685a
Use ++ instead of += 1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 1ba15b8acaf8625db23ccd7d0ba7d3acf7d2f69e
Component: engine
2014-08-26 09:27:07 +04:00
SvenDowideit
73e4ee940c
Fix the other API docs to use an array of key/values
...
as per #7706
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Component: engine
2014-08-26 11:36:25 +10:00
getvictor
db566d8d04
Updating LxcConf to match Docker command line
...
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.
Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com > (github: SvenDowideit)
Upstream-commit: 216ab880f96125566f2816510ba9d396dcf103f0
Component: engine
2014-08-26 11:36:25 +10:00
Sven Dowideit
f9e7d27fe5
Merge pull request #7733 from Djelibeybi/oraclelinux-docs
...
Oracle Linux docs
Upstream-commit: a05d8d4f4ffd67be34738c80b862ef949dddef65
Component: engine
2014-08-25 18:14:36 -07:00
Avi Miller
1dae3fa4de
Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: fcad8ee83a2cf9192ba4f9ec7d5c1d0b03a6aa47
Component: engine
2014-08-26 11:10:09 +10:00
Sven Dowideit
bd4553339f
Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel
...
Ubuntu backported kernel
Upstream-commit: 849086d3d965cea7d7e04b3559edc9c903e30ba6
Component: engine
2014-08-25 17:16:34 -07:00
SvenDowideit
cd586bd31e
small word change
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 93d574298da0f420c19db52b75ebf31ed3cb2ec9
Component: engine
2014-08-26 10:15:12 +10:00
Hollie Teal
296956ed9d
Image additions and copy changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 1d1bb2ae4507f67bd7192dd9f19d13cd1bce7d53
Component: engine
2014-08-25 16:50:55 -07:00
Sven Dowideit
a3c910b1d1
Merge pull request #7603 from kuon/centos7
...
Added manual installation instruction for Centos7 and note about firewalld.
Upstream-commit: 97c7b0115b62a698123eec1b2548ff85937ba35a
Component: engine
2014-08-25 16:49:09 -07:00
Michael Crosby
4d0ceee016
Merge pull request #7574 from crosbymichael/update-restart-docs
...
Update flag usages and docs for max restart count
Upstream-commit: b0abd6de635e3bac9c6aa40aa98f53a5d9e15f98
Component: engine
2014-08-25 16:26:06 -07:00