toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,507 Commits 3 Branches 295 Tags
08bbce0a2c1934b7de5b8db2c5ef4fdf00f1a521
Commit Graph
11507 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Hollensbe 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
Erik Hollensbe 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
Erik Hollensbe 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
Fred Lifton 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
Erik Hollensbe 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
Erik Hollensbe 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
Erik Hollensbe 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux e59ed0e9b1 move TestKillDifferentUser 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eb9379c5d05848c525f7c3d75b66a4b356227d57
Component: engine
 2014-08-27 23:34:37 +00:00
Sven Dowideit 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
SvenDowideit 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
Victor Vieux 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
Fred Lifton 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
Michael Crosby bc07761e2a Merge pull request #7764 from vieux/revert 
Revert "--help option and help command should print to stdout not stderr"
Upstream-commit: e0db426ff635f09df2f603caa7791e763bdb076d
Component: engine
 2014-08-27 12:02:02 -07:00
Victor Vieux 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
Hollie Teal 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
Michael Crosby 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
Robert Bittle 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
Victor Vieux 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
James Turnbull d3b31ca9dc Added Syntax highlighting file for the KDE Kate Editor 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7458a82e0bbf4353729cfac3e1d7159b9d466161
Component: engine
 2014-08-27 11:16:51 -07:00
Eric Windisch 94a36f4c63 Restrict repository names from matching hexadecimal strings 
To avoid conflicting with layer IDs, repository names must
not be tagged with names that collide with hexadecimal strings.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 0bd1c05e5c36799e0740a155092be0c9c417f175
Component: engine
 2014-08-27 13:46:10 -04:00
Alexandr Morozov 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
Michael Crosby 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
Brian Goff 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
Dawn Chen d13bbe9188 Bump containervm version to the latest one: 20140826 
Upstream-commit: 9cd77818bbf07ac5278f30f302d82af01243a5c9
Component: engine
 2014-08-26 16:59:21 -07:00
Hollie Teal 24190e7f53 Final changes. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 161cc21f245cf05c6c2c168a6f5981989026e2cb
Component: engine
 2014-08-26 14:01:10 -07:00