p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,238 Commits 2 Branches 295 Tags
8812387cabdd1a67c4ee1fc0eaf3496cd2d74aaa
Commit Graph

10238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
James Turnbull
16bdc5c32b Merge pull request #7741 from LK4D4/bump_docs_to_1.15 
Bump docs and api to 1.15
Upstream-commit: 4fe6115fb125d5acddec328e2dcfb23b6fe61ffa
Component: engine
 2014-08-26 13:44:05 -07:00
James Turnbull
133de3a18a Merge pull request #7735 from SvenDowideit/lxcconf-api-docs 
Lxcconf api docs
Upstream-commit: 5b6c25f75192a75ff597470b3f6ba0981f6d3011
Component: engine
 2014-08-26 13:43:48 -07:00
Michael Crosby
48ffeaab82 Merge pull request #7745 from LK4D4/fix_docker_host_panic 
Fix panic for DOCKER_HOST without ://
Upstream-commit: b458dd1dfb9a105d65d1d5853408b200316b7275
Component: engine
 2014-08-26 11:23:30 -07:00
Tibor Vass
b00ca614f6 Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904 
Fix race condition between cleanup and Start
Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683
Component: engine
 2014-08-26 14:17:11 -04:00
Michael Crosby
f5f64f68ea Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
Upstream-commit: 55f7dd8198549b704089a51662e3c511d028706c
Component: engine
 2014-08-26 10:59:05 -07:00
Michael Crosby
ff69012bd1 Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
 2014-08-26 10:53:40 -07:00
Alexandr Morozov
62eb5165d1 Fix race condition between cleanup and Start 
There was problem when Start might be before cleanup

Fixes #6904

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 12ff89a3901cd2debf13e7ccc3a1a780380e4dd9
Component: engine
 2014-08-26 20:57:12 +04:00
Alexandr Morozov
fef7b9ee0d Fix panic for DOCKER_HOST without :// 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 660cc4a2675d34695406b2506344a2a18f2a59e9
Component: engine
 2014-08-26 20:32:10 +04:00
Tibor Vass
b029406e18 Merge pull request #7615 from crosbymichael/fix-utils-panic 
Fix panic in validate context for build
Upstream-commit: 63ed18ad11a0ae563a3b75af4c6660e63667f896
Component: engine
 2014-08-26 10:30:42 -04:00
Alexandr Morozov
b22bbbc6cc Bump docs and api to 1.15 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
 2014-08-26 13:08:50 +04:00
Alexandr Morozov
b5fb241c16 Style fixes for registry/registry.go 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 45a2923874a9b1f70674e627d0d112851d5982a8
Component: engine
 2014-08-26 12:28:40 +04:00
Alexandr Morozov
6eedef59d9 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 698392cb512ba0c85e69a669f115d67c1d50cb98
Component: engine
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
71bf8c685a Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1ba15b8acaf8625db23ccd7d0ba7d3acf7d2f69e
Component: engine
 2014-08-26 09:27:07 +04:00
SvenDowideit
73e4ee940c Fix the other API docs to use an array of key/values 
as per #7706

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Component: engine
 2014-08-26 11:36:25 +10:00