Vishal Doshi
d27f1bb000
Update debian.md
...
Add some instructions for Debian 7 (aka Wheezy/Stable)
Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
2014-09-01 00:50:49 +05:30
James Turnbull
014471ad39
Merge pull request #7751 from dchen1107/master
...
Bump containervm version to the latest one: 20140826
2014-08-31 14:16:22 -04:00
James Turnbull
a25594c867
Merge pull request #7805 from nzwsch/patch-1
...
Update nodejs_web_app.md
2014-08-31 14:14:40 -04:00
Alexandr Morozov
c8999dc326
Merge pull request #7817 from cnf/fix_cli_top_test_priv
...
Fixed error check using the wrong error value
2014-08-31 19:24:33 +04:00
Frank Rosquin
d93c95a332
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>
2014-08-31 16:35:38 +02:00
Alexandr Morozov
d301146c4b
Merge pull request #7816 from cnf/fix_cli_top_test
...
fixed error check using the wrong error value
2014-08-31 18:28:29 +04:00
Frank Rosquin
82c536aacd
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>
2014-08-31 16:21:53 +02:00
Erik Hollensbe
d7dd35bbd6
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)
2014-08-31 05:53:05 -07:00
Erik Hollensbe
a0255ba502
Fix panic when `ENV ARG=ARG` is used.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-31 05:39:36 -07:00
Erik Hollensbe
394a6d3154
docker top: fix command when multiple arguments are supplied
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-31 01:18:15 -07:00
Alexandr Morozov
16e850fe3e
Use increment operator
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-30 21:43:48 +04:00
nzwsch
2d1ec162be
Update nodejs_web_app.md
2014-08-30 16:02:47 +09:00
Victor Vieux
280b64bc7b
Merge pull request #7775 from LK4D4/merge_state_lock
...
Merge Container and State mutexes
2014-08-29 11:25:21 -07:00
Michael Crosby
8b74ac6717
Merge pull request #7795 from LK4D4/style_fixes
...
Some more style fixes
2014-08-29 10:59:37 -07:00
Victor Vieux
9c0b851e4c
Merge pull request #6628 from SvenDowideit/6501-list-all-docker-ports
...
List all ports when calling `docker port container`
2014-08-29 10:57:20 -07:00
Alexandr Morozov
114838cbda
Some more style fixes
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-29 15:21:28 +04:00
Alexandr Morozov
517ba44e37
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>
2014-08-29 12:56:04 +04:00
SvenDowideit
4e340cedec
List all ports when calling `docker port container`
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-08-29 18:31:51 +10:00
Sven Dowideit
f1934e5979
fs.Visit() returns nil flag
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2014-08-29 15:38:03 +10:00
Victor Vieux
6eaac7d571
Merge pull request #5518 from vbatts/vbatts-save_many
...
docker save: ability to save multiple images
2014-08-28 18:40:28 -07:00
Vincent Batts
79501dcd4f
save many: adding an integration-cli test
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-08-28 21:33:13 -04:00
James Turnbull
f1a42fb609
Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag
...
Give the <strong> tag some CSS (the .content-body resets it)
2014-08-28 18:12:54 -07:00
Fred Lifton
d420b2cce0
Merge pull request #7786 from psftw/volume_removal
...
Be more explicit about volume lifecycle
2014-08-28 18:11:28 -07:00
SvenDowideit
7de977368c
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)
2014-08-29 11:08:56 +10:00
Sven Dowideit
2bf41be514
Merge pull request #7769 from fredlf/1.2.0_release-notes
...
Adding release notes to docs home
2014-08-28 17:37:15 -07:00
Fred Lifton
810c231b91
Fixed typos based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-08-28 17:29:09 -07:00
Vincent Batts
e64131d1bf
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)
2014-08-28 20:22:33 -04:00
Sven Dowideit
31d2701377
Merge pull request #7749 from hollietealok/master
...
Doc: Resizing Boot2Docker Volume with VirtualBox
2014-08-28 16:08:29 -07:00
Hollie Teal
0f8d461ed7
Final tweaks.
...
Signed-off-by: Hollie Teal <hollie@docker.com>
2014-08-28 13:51:38 -07:00
Peter Salvatore
bfa3d5fa72
Be more explicit about volume removal
...
Signed-off-by: Peter Salvatore <peter@psftw.com>
2014-08-28 16:44:41 -04:00
Hollie Teal
ce73a3bcf7
Added changes brought up in PR discussion.
...
Signed-off-by: Hollie Teal <hollie@docker.com>
2014-08-28 11:04:53 -07:00
Alexandr Morozov
bc41261de0
Merge pull request #7782 from somaopensource/graph_remove_fixme
...
graph: remove obsolete comments
2014-08-28 20:03:16 +04:00
Daehyeok.Mun
59d58352df
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>
2014-08-29 00:22:26 +09:00
unclejack
3256050ed4
deny net host + dns and links with container net
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-08-28 16:58:54 +03:00
unclejack
d244e8c379
Merge pull request #7774 from somaopensource/graph_fixme
...
graph: change argument order of Register function
2014-08-28 16:36:23 +03:00
Daehyeok.Mun
35df24c8e6
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>
2014-08-28 20:06:07 +09:00
unclejack
22b585e0fc
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
2014-08-28 13:38:28 +03:00
Victor Vieux
d9f8d3ea9f
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
2014-08-27 23:22:47 -07:00
Victor Vieux
a26fc6cae8
Merge pull request #7772 from LK4D4/log_dones
...
Add logDone logs where it's missing
2014-08-27 22:46:54 -07:00
Alexandr Morozov
3c984a6d15
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-28 09:25:57 +04:00
Michael Crosby
334dca15b0
Merge pull request #7647 from ewindisch/erw-tarsum-maintainer
...
Add Eric Windisch to MAINTAINER for tarsum
2014-08-27 20:00:19 -07:00
Michael Crosby
2a5e29adc6
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
2014-08-27 19:54:09 -07:00
Michael Crosby
77eefbc688
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
2014-08-27 19:43:16 -07:00
Michael Crosby
345e3811fe
Merge pull request #7767 from vieux/move_some_tests
...
Move some tests
2014-08-27 19:28:31 -07:00
Erik Hollensbe
2ef1dec7e8
builder: Refactors according to @tiborvass's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
305f735080
builder: several fixups from comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
a1522ec01c
builder: move the evaluator package code directly into builder
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
cb51681a6d
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)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
1ae4c00a19
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)
2014-08-27 18:52:30 -07:00
Erik Hollensbe
3dfe5ddfb9
builder: Remove spurious .gitignores
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00