p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,283 Commits 2 Branches 295 Tags
8c659df87897c057c0900a533b4e214422ea00ec
Commit Graph

10283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
8c659df878 Try to go for 80-char lines and a little md wrangling. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 2852037018e435dc61a27725a307595a6f57da40
Component: engine
 2014-09-01 09:55:53 +10:00
Vishal Doshi
533c5e1fed Update debian.md 
Add some instructions for Debian 7 (aka Wheezy/Stable)

Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
Upstream-commit: d27f1bb00006fc936c0cb393c93131427e68fef6
Component: engine
 2014-09-01 00:50:49 +05:30
James Turnbull
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
James Turnbull
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
Alexandr Morozov
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
Frank Rosquin
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
Alexandr Morozov
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
Frank Rosquin
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
nzwsch
9fba71437d Update nodejs_web_app.md 
Upstream-commit: 2d1ec162be15d6d1107d4775d75744c9d23f8478
Component: engine
 2014-08-30 16:02:47 +09:00
Victor Vieux
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
Michael Crosby
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
Victor Vieux
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
Alexandr Morozov
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
Alexandr Morozov
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
SvenDowideit
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
Victor Vieux
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
Vincent Batts
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
James Turnbull
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
Fred Lifton
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
SvenDowideit
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
Sven Dowideit
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
Fred Lifton
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
Vincent Batts
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
Sven Dowideit
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
Hollie Teal
3de067038b Final tweaks. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 0f8d461ed7c8b338d671bea0240b288fa91155b6
Component: engine
 2014-08-28 13:51:38 -07:00
Peter Salvatore
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
Hollie Teal
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
Alexandr Morozov
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
Daehyeok.Mun
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
unclejack
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
Daehyeok.Mun
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
unclejack
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
Victor Vieux
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
Victor Vieux
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
Alexandr Morozov
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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
Erik Hollensbe
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