7ffe4a077d
Merge pull request #7775 from LK4D4/merge_state_lock
...
Merge Container and State mutexes
Upstream-commit: 280b64bc7baf3cff48eb2f07330d693eebfaaee7
Component: engine
2014-08-29 11:25:21 -07:00
446314ea70
Merge pull request #7795 from LK4D4/style_fixes
...
Some more style fixes
Upstream-commit: 8b74ac67176090908bc1f9f713bd41f926b42862
Component: engine
2014-08-29 10:59:37 -07:00
cc2787ae0d
Some more style fixes
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 114838cbda38f4808d3a7a0d40b33d2ee445d158
Component: engine
2014-08-29 15:21:28 +04:00
76ca127323
Merge Container and State mutexes
...
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 517ba44e3742c39c4c3fc249b8c40e9b7ddd845f
Component: engine
2014-08-29 12:56:04 +04:00
6c5eee34ef
List all ports when calling docker port container
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4e340cedeccabcae8875dd35f8c984246d6c3bc1
Component: engine
2014-08-29 18:31:51 +10:00
e5a06cff90
Merge pull request #5518 from vbatts/vbatts-save_many
...
docker save: ability to save multiple images
Upstream-commit: 6eaac7d5710016d9717cb79b48c1bfe5f3ac92af
Component: engine
2014-08-28 18:40:28 -07:00
5583bba50b
save many: adding an integration-cli test
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 79501dcd4f7a207067c234766ae4788007a1d91b
Component: engine
2014-08-28 21:33:13 -04:00
e57774383c
Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag
...
Give the <strong> tag some CSS (the .content-body resets it)
Upstream-commit: f1a42fb609202774a96e20de44f2837e7d23def8
Component: engine
2014-08-28 18:12:54 -07:00
ff9b902fe8
Merge pull request #7786 from psftw/volume_removal
...
Be more explicit about volume lifecycle
Upstream-commit: d420b2cce0864c85377fa37810c6e2f1abd07350
Component: engine
2014-08-28 18:11:28 -07:00
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
74bea8e421
Merge pull request #7769 from fredlf/1.2.0_release-notes
...
Adding release notes to docs home
Upstream-commit: 2bf41be514e54f951985ee70dafcfc0ae3e1acb5
Component: engine
2014-08-28 17:37:15 -07:00
b17a5fe632
Fixed typos based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 810c231b912c0a12acb8eb82a3756276e47fa632
Component: engine
2014-08-28 17:29:09 -07:00
4d890308d7
docker save: ability to save multiple images
...
Now from a single invocation of `docker save`, you can specify multiple
images to include in the output tar, or even just multiple tags of a
particular image/repo.
```
> docker save -o bundle.tar busybox ubuntu:lucid ubuntu:saucy fedora:latest
> tar tf ./bundle.tar | wc -l
42
> tar xOf ./bundle.tar repositories
{"busybox":{"latest":"2d8e5b282c81244037eb15b2068e1c46319c1a42b80493acb128da24b2090739"},"fedora":{"latest":"58394af373423902a1b97f209a31e3777932d9321ef10e64feaaa7b4df609cf9"},"ubuntu":{"lucid":"9cc9ea5ea540116b89e41898dd30858107c1175260fb7ff50322b34704092232","saucy":"9f676bd305a43a931a8d98b13e5840ffbebcd908370765373315926024c7c35e"}}
```
Further, this fixes the bug where the `repositories` file is not created
when saving a specific tag of an image (e.g. ubuntu:latest)
document multi-image save and updated API docs
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: e64131d1bf7c79358d5ee7a1a98626730db3593b
Component: engine
2014-08-28 20:22:33 -04: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
431506329f
Be more explicit about volume removal
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: bfa3d5fa726dc27e44208b51557edca9b64cf4e9
Component: engine
2014-08-28 16:44:41 -04: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
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
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
