06de394335
Merge pull request #7825 from LK4D4/move_integration_to_cli
...
Move integration to cli
Upstream-commit: efc6c9ba2f51a6103a9c982ab15e508e28e64831
Component: engine
2014-09-01 11:38:57 -07:00
94c61e97d5
Merge pull request #7812 from erikh/fix_top
...
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
2014-09-01 11:31:38 -07:00
ba45bffa03
Merge pull request #7809 from LK4D4/use_increment
...
Use increment operator
Upstream-commit: ec87846908287fd87d628a4b74f26e96c9c5f9cc
Component: engine
2014-09-01 11:16:25 -07:00
db97aa6a31
Merge pull request #7791 from SvenDowideit/mflag-Visit-returns-nil-flag
...
fs.Visit() returns nil flag
Upstream-commit: ac69b661eed2fe410bd4275951e31c6f93e274d3
Component: engine
2014-09-01 11:13:32 -07:00
ca3fe8ca1e
Merge pull request #7814 from erikh/fix_parser_env
...
Fix panic when `ENV ARG=ARG` is used.
Upstream-commit: 09d36709076ac56387a12a7465b6a236e1253ff5
Component: engine
2014-09-01 11:03:21 -07:00
4f814a8405
Move TestRunCidFileCheckIDLength to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 195cee99839a77afec7aaf7fe43cb5a9ceae4f57
Component: engine
2014-09-01 20:15:20 +04:00
797834a228
Move TestRunCidFileCleanupIfEmpty to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 8892320835ad2b21b0efd4848d2af0d8a791a8e9
Component: engine
2014-09-01 19:55:39 +04:00
ec0e80ec0b
Merge pull request #7820 from SvenDowideit/eik3-exit-doc-patch
...
alternative to `exit` command: `CTRL-D`
Upstream-commit: 2aaa8892e3d126e20f2659e9b71a9ce9973cf60f
Component: engine
2014-08-31 20:39:23 -07:00
c3ac4898d5
alternative to exit command: CTRL-D
...
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net > (github: eik3)
Upstream-commit: c0c525b3d1a527738c1d942efd70e810908c0eac
Component: engine
2014-09-01 13:38:25 +10:00
176595f966
Merge pull request #7751 from dchen1107/master
...
Bump containervm version to the latest one: 20140826
Upstream-commit: 014471ad39b2f2a0ffbe4d943c2d0068dd3105e0
Component: engine
2014-08-31 14:16:22 -04:00
ae6455c27b
Merge pull request #7805 from nzwsch/patch-1
...
Update nodejs_web_app.md
Upstream-commit: a25594c86713dea42b2b3649c0919225ce8f176f
Component: engine
2014-08-31 14:14:40 -04:00
80ace0ef1f
Merge pull request #7817 from cnf/fix_cli_top_test_priv
...
Fixed error check using the wrong error value
Upstream-commit: c8999dc326c9d722386c88ba6cca219b8029452e
Component: engine
2014-08-31 19:24:33 +04:00
f0aedfc820
Fixed error check using the wrong error value
...
errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time
Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com >
Upstream-commit: d93c95a332b65948cf37a87a84900323657571f0
Component: engine
2014-08-31 16:35:38 +02:00
50d06f5bca
Merge pull request #7816 from cnf/fix_cli_top_test
...
fixed error check using the wrong error value
Upstream-commit: d301146c4b7b788f77b6ae77a574e75174a7f8d5
Component: engine
2014-08-31 18:28:29 +04:00
3a37023687
fixed error check using the wrong error value
...
errorOut was using the err from the previous test.
Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com >
Upstream-commit: 82c536aacd30baf110c074de1f83ae3ab2f9588c
Component: engine
2014-08-31 16:21:53 +02:00
e16ec47eeb
Add a test for the multiple arguments passed to docker top
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: d7dd35bbd6250fcf42f8fe6521a55813e670f805
Component: engine
2014-08-31 05:53:05 -07:00
3c324ec48a
Fix panic when ENV ARG=ARG is used.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a0255ba502d7a60a297aa67604eae75a9e1fbed3
Component: engine
2014-08-31 05:39:36 -07:00
c382a20d9b
docker top: fix command when multiple arguments are supplied
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 394a6d3154fe810565ddc5619447c8a82e7ce38c
Component: engine
2014-08-31 01:18:15 -07:00
fe6985381c
Use increment operator
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 16e850fe3ea42f5103c9a11f3db17d11dc4f6ada
Component: engine
2014-08-30 21:43:48 +04:00
9fba71437d
Update nodejs_web_app.md
...
Upstream-commit: 2d1ec162be15d6d1107d4775d75744c9d23f8478
Component: engine
2014-08-30 16:02:47 +09:00
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
0c92dc62dd
Merge pull request #6628 from SvenDowideit/6501-list-all-docker-ports
...
List all ports when calling `docker port container`
Upstream-commit: 9c0b851e4cf45968af5ac67c3fa04fd250606cb5
Component: engine
2014-08-29 10:57:20 -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
5867aa701f
fs.Visit() returns nil flag
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: f1934e59790c9af6466075d3d050386627ad1a9a
Component: engine
2014-08-29 15:38:03 +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
a30bdc9fec
Merge pull request #7782 from somaopensource/graph_remove_fixme
...
graph: remove obsolete comments
Upstream-commit: bc41261de0b4827e749c67ab10bcc79369d64e57
Component: engine
2014-08-28 20:03:16 +04: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
910efd9532
Merge pull request #7774 from somaopensource/graph_fixme
...
graph: change argument order of Register function
Upstream-commit: d244e8c3796b93c3c5889f49e50c15d1f66577a5
Component: engine
2014-08-28 16:36:23 +03: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
0e7dd1a912
Merge pull request #7772 from LK4D4/log_dones
...
Add logDone logs where it's missing
Upstream-commit: a26fc6cae8a3e5cd086769613c73fd1f3ce1b723
Component: engine
2014-08-27 22:46:54 -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
