p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,005 Commits 2 Branches 295 Tags
ece94d0722976501e7b329f9bdb22cc5484eea68
Commit Graph

1297 Commits

Author SHA1 Message Date
Brian Goff
078d379cc0 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
 2015-04-22 21:05:15 -04:00
Alexander Morozov
03223ccad9 Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
Upstream-commit: 3dc07162bdb457c86c0d5025d1d633131fadcfd1
Component: engine
 2015-04-22 17:20:10 -07:00
Brian Goff
628a79ad40 Cleanup daemon/volumes 
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
  volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
  volume)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f3680e74946d3a773edb118ea3f508b8237e44a8
Component: engine
 2015-04-22 19:32:10 -04:00
Jessie Frazelle
2cd5fc4ea7 Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp 
Make `docker cp` bind-mount volumes
Upstream-commit: 1d48cccc996885fe02b4824d9421735566a52088
Component: engine
 2015-04-22 15:59:28 -07:00
Antonio Murdaca
fdf9a8d629 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
 2015-04-23 00:58:13 +02:00
Jessie Frazelle
54ac8d85af Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
Upstream-commit: 3c9ae03a868bb86fdb3026a21ef1b9a3f6a75dfb
Component: engine
 2015-04-22 15:32:14 -07:00
Daniel, Dao Quang Minh
925bb7aac9 remove unused utils 
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: 71b5a754cec09b2f1bcef986bdd6fd109451b8f2
Component: engine
 2015-04-22 21:53:45 +00:00
Dan Walsh
bfa8bbb7bb Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: b88b2fa72ea4ad579478080ce6f027e55cfd5c29
Component: engine
 2015-04-22 17:37:26 -04:00
jianbosun
f089bf1e0a remove execCreate & execStart from job 
Also removed the function ExecConfigFromJob

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
 2015-04-22 13:51:57 -07:00
Brian Goff
b6c443e015 Merge pull request #12564 from LK4D4/remove_jobs_trust 
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
 2015-04-21 16:49:01 -04:00
Antonio Murdaca
7c675b1db2 Remove not needed call to container.readHostConfig() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f
Component: engine
 2015-04-21 22:00:33 +02:00
Dan Walsh
b04ccc089c Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
 2015-04-21 12:57:54 -04:00
Jessie Frazelle
cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
bf5cc9f8c8 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
 2015-04-20 17:27:17 -07:00
Jessie Frazelle
a2ec388af9 Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
 2015-04-20 17:02:43 -07:00
Arnaud Porterie
9d30ecdb29 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
 2015-04-20 15:50:35 -07:00
Phil Estes
e0b5db7169 Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
 2015-04-20 17:27:17 -04:00
David Calavera
16569396d9 Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
 2015-04-20 13:37:06 -07:00
Alexander Morozov
0790d1610c Remove engine from trust 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9e50bf6270f426f6ef6649b1985036988b207407
Component: engine
 2015-04-20 12:48:33 -07:00
Alexander Morozov
6f3b598444 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
Upstream-commit: a7690076c955d242b4590fcf557f15e1029d0c8b
Component: engine
 2015-04-20 11:51:04 -07:00
Phil Estes
8301d9df26 Merge pull request #12545 from coolljt0725/remove_rudundant_enter 
Remove redundant `\n` in daemon/daemon.go
Upstream-commit: 490a0bd697168997f21bd354a647df6eab2bd051
Component: engine
 2015-04-20 14:32:27 -04:00
Srini Brahmaroutu
97fb2745d9 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
 2015-04-20 17:57:53 +00:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Alexander Morozov
6d0917e016 Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive 
clenaup: delete unused function getEnv
Upstream-commit: d2ce1076a453ac1c016e5637eabae1d8f26cda9e
Component: engine
 2015-04-20 07:50:06 -07:00
Lei Jitang
2f9e9a0229 Remove redundant '\n' in daemon.go and correct the warning messages for memory swap 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2d5ede67c098dd11803d502865ab546388f2a553
Component: engine
 2015-04-20 22:00:03 +08:00
Sylvain Baubeau
6f062d5e99 Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
 2015-04-20 15:13:30 +02:00
Hu Keping
899b777d56 Remove Job from Info API 
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
 2015-04-20 18:14:06 +08:00
Ma Shimiao
8b9e25d786 clenaup: delete unused function getEnv 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e607bb49c48e0478b07fceb640d3e765151050e4
Component: engine
 2015-04-20 16:32:42 +08:00
Ankush Agarwal
396287023b gofmt whole directory 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: edf541c22b5253a980ee061b35110d0da8fdb905
Component: engine
 2015-04-20 01:08:51 -07:00
Doug Davis
14bae8f05b Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
 2015-04-19 16:02:28 -04:00
Brian Goff
9e36d6f575 Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic 
change code to clarify logic
Upstream-commit: 89092252f07604b7bc1f24fcf3314ed0d43916de
Component: engine
 2015-04-19 07:39:24 -04:00
Simei He
dd5f4141fe remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
 2015-04-19 18:36:56 +08:00
Megan Kostick
26d411e68d Updated message severity in graphdriver 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: cdc63ce5d032de593fc2fd13997311b316c0103b
Component: engine
 2015-04-17 10:56:12 -07:00
Antonio Murdaca
47592700e5 Add minor stylistic fixes 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 1c89c6ea2f34f51a05215279c9cdefca30bb13b1
Component: engine
 2015-04-16 21:22:32 +02:00
Antonio Murdaca
105ea026b0 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e41192a3f8cbfbbfecde03f58a3b2be2b1afd836
Component: engine
 2015-04-16 18:50:24 +02:00
Yan Feng
6cf040802b Fix a typo in docker/daemon/state.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 7e01ecc119ea3871058309a47a3f9cbf2a9483dd
Component: engine
 2015-04-16 10:56:15 -04:00
Ma Shimiao
00001e0281 optimize code to clarify logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 93cdb0071be29cde5e9f5574926ae628ef4cfc41
Component: engine
 2015-04-16 19:56:25 +08:00
Jessie Frazelle
586b88bb0d Merge pull request #12423 from crosbymichael/idkbutitworks 
Ensure state is destroyed on daemont restart
Upstream-commit: 1899b2f41a73a6596ba167c9c710affde3dae550
Component: engine
 2015-04-15 21:19:38 -07:00
Brian Goff
884bdce09a Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
 2015-04-15 21:49:25 -04:00
Michael Crosby
d0cae5a6bf Ensure state is destroyed on daemont restart 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a5f7c4aa31fa1ee2a3bebf4d38f5fda7a4a28a0d
Component: engine
 2015-04-15 17:44:03 -07:00
Jessie Frazelle
9fa728d386 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
Upstream-commit: 2e4d36ed80855375231501983f19616ba0238a84
Component: engine
 2015-04-15 14:47:12 -07:00
Darren Shepherd
78dcc43512 Change syslog format and facility 
This patch changes two things

1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
   the log

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 05641ccffc5088a382fa3bfb21f1276ccb6c1fc0
Component: engine
 2015-04-15 12:46:43 -07:00
Brian Goff
ab74fc7837 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
Upstream-commit: f0c60f7085ea124c2d3660fae17c1d2ab7e4abb0
Component: engine
 2015-04-15 14:28:39 -04:00
Brian Goff
79544ae835 Merge pull request #12139 from hqhq/hq_add_cpusest_mems2 
add support for cpuset.mems
Upstream-commit: 2ecccda1628388a6a29a2cd3bb40630f0afe5351
Component: engine
 2015-04-15 13:29:43 -04:00
David Calavera
234898b4e7 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
 2015-04-15 10:22:07 -07:00
Jessica Frazelle
72996be1fe try to modprobe bridge 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: b3867b889960604904a4afbab6450bb9528afe06
Component: engine
 2015-04-15 07:19:37 -07:00
Deng Guangxing
e04ea19d11 Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: acf025ad1b806fd9b5eb3358a8e1d75c6aae890d
Component: engine
 2015-04-15 11:51:24 +08:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
David Calavera
fa70da1003 Remove engine.Job from Create action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 98996a432e079d1434182ea1cf84e70c927da4c2
Component: engine
 2015-04-14 15:33:12 -07:00
David Calavera
c44394bb9b Remove engine.Job from Start action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 610c436e07388f4898020432b25939cc7104b894
Component: engine
 2015-04-14 15:33:12 -07:00