dc54819eb5
Give the <strong> tag some CSS (the .content-body resets it)
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 7de977368cf5d8290c76b7127246996e90932e13
Component: engine
2014-08-29 11:08:56 +10:00
7e95f54878
Merge pull request #7749 from hollietealok/master
...
Doc: Resizing Boot2Docker Volume with VirtualBox
Upstream-commit: 31d2701377c6667ad099226fe25004345017fb5d
Component: engine
2014-08-28 16:08:29 -07:00
3de067038b
Final tweaks.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 0f8d461ed7c8b338d671bea0240b288fa91155b6
Component: engine
2014-08-28 13:51:38 -07:00
44d46dd074
Added changes brought up in PR discussion.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: ce73a3bcf77e1333a000a55de8df033dce6e54ae
Component: engine
2014-08-28 11:04:53 -07:00
58c4d9bd7f
graph: remove obsolete comments
...
Graph.Get function already returns nil when the image doesn't exist so
following comment is obsolete.
FIXME: return nil when the image doesn't exist, instead of an error
Signed-off-by: Daehyeok.Mun <daehyeok@gmail.com >
Upstream-commit: 59d58352dfb66a12000d4b65f6c337c7936326e3
Component: engine
2014-08-29 00:22:26 +09:00
245b05f4a2
graph: change argument order of Register function
...
This commit is patch for following comment
FIXME: pass img as first argument
Signed-off-by: Daehyeok.Mun <daehyeok@gmail.com >
Upstream-commit: 35df24c8e6195ebac6ea28ed4dda5b53b1021f38
Component: engine
2014-08-28 20:06:07 +09:00
c1357a0a27
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
Upstream-commit: 22b585e0fcd5e844b1c35e9b5d98757920afc1dd
Component: engine
2014-08-28 13:38:28 +03:00
e1ce13e0e5
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
Upstream-commit: d9f8d3ea9f5b700e8e2f8eb37bcc0ca6f8b8360c
Component: engine
2014-08-27 23:22:47 -07:00
def10d2ed4
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 3c984a6d1578947c5adfe13993cb28d88a674bbf
Component: engine
2014-08-28 09:25:57 +04:00
e0cd0203dd
Merge pull request #7647 from ewindisch/erw-tarsum-maintainer
...
Add Eric Windisch to MAINTAINER for tarsum
Upstream-commit: 334dca15b0800cbbac99dc784d977ae0e094c716
Component: engine
2014-08-27 20:00:19 -07:00
364fb8763b
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
Upstream-commit: 2a5e29adc62b0a45e7548c51e5cebc4855d54b48
Component: engine
2014-08-27 19:54:09 -07:00
a040de5fce
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
Upstream-commit: 77eefbc68894c77862608632822619abfc0c58d6
Component: engine
2014-08-27 19:43:16 -07:00
d2f5b7e095
Merge pull request #7767 from vieux/move_some_tests
...
Move some tests
Upstream-commit: 345e3811fe3a23d05b715098c2a1a2b20c3a1428
Component: engine
2014-08-27 19:28:31 -07:00
5c6641e945
builder: Refactors according to @tiborvass's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 2ef1dec7e8d405f237b68ca104d457d78b8caed1
Component: engine
2014-08-27 18:52:30 -07:00
4308bf42dd
builder: several fixups from comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 305f73508022d0a3af65faa327aa798610969875
Component: engine
2014-08-27 18:52:30 -07:00
8812387cab
builder: move the evaluator package code directly into builder
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a1522ec01c21807e657e840760a8186f482f2271
Component: engine
2014-08-27 18:52:30 -07:00
e5b50b40c8
builder: Fix handling of ENV references that reference themselves, plus tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: cb51681a6db4b7c62d91998ba3b1d3b98c09c61c
Component: engine
2014-08-27 18:52:30 -07:00
b36a54587e
builder: fix references to jobs in daemon, make builder a first class
...
package referring to evaluator
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 1ae4c00a19edb7d3b41c050489e56339833d8e01
Component: engine
2014-08-27 18:52:30 -07:00
5864fecb92
builder: Remove spurious .gitignores
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3dfe5ddfb98a36ddcf2480720255a3a00f5fbc1d
Component: engine
2014-08-27 18:52:30 -07:00
6e79082f26
builder/parser: Rewrite Parse() to use := instead of var
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 248f4c4f751b76f330278b04d2297bfcf97eec48
Component: engine
2014-08-27 18:52:30 -07:00
79129740f8
builder: Remove blankNode(), use &Node{} instead.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 135f54ccbfb6f638b4ab0be67a215adbad246ecb
Component: engine
2014-08-27 18:52:30 -07:00
27916f0d04
builder: handle certain classes of JSON errors gracefully
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 21b15ac920d5e51f636d7febf07a4a52f5e61bff
Component: engine
2014-08-27 18:52:30 -07:00
b8ca57b41d
builder: negative test support, fix for shykes's broken dockerfile
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 4122a981ae12851f71bbf6ec46e03bba288e4143
Component: engine
2014-08-27 18:52:30 -07:00
1fe3a4f0e3
builder: comments / documentation
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3f5f6b038f56bc89d39a74fbb9c765daf98ae4d8
Component: engine
2014-08-27 18:52:30 -07:00
8d44d56320
builder: add command handling to evaluator.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: d6c0bbc3cbf9204c506fedf4d0c5a477c7559a1d
Component: engine
2014-08-27 18:52:30 -07:00
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
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
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
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
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
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
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
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
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
e59ed0e9b1
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb9379c5d05848c525f7c3d75b66a4b356227d57
Component: engine
2014-08-27 23:34:37 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
24190e7f53
Final changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 161cc21f245cf05c6c2c168a6f5981989026e2cb
Component: engine
2014-08-26 14:01:10 -07:00
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
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
