docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,004 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1297 Commits

Author SHA1 Message Date
Brian Goff 3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Alexander Morozov 3dc07162bd Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
 2015-04-22 17:20:10 -07:00
Brian Goff f3680e7494 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>
 2015-04-22 19:32:10 -04:00
Jessie Frazelle 1d48cccc99 Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp 
Make `docker cp` bind-mount volumes
 2015-04-22 15:59:28 -07:00
Antonio Murdaca 4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Jessie Frazelle 3c9ae03a86 Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
 2015-04-22 15:32:14 -07:00
Daniel, Dao Quang Minh 71b5a754ce remove unused utils 
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-22 21:53:45 +00:00
Dan Walsh b88b2fa72e Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-22 17:37:26 -04:00
jianbosun 24425021d2 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>
 2015-04-22 13:51:57 -07:00
Brian Goff b098a42559 Merge pull request #12564 from LK4D4/remove_jobs_trust 
Remove engine from trust
 2015-04-21 16:49:01 -04:00
Antonio Murdaca a3c4801c92 Remove not needed call to container.readHostConfig() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-21 22:00:33 +02:00
Dan Walsh 364287b741 Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-21 12:57:54 -04:00
Jessie Frazelle 17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle 82f75df9e9 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
 2015-04-20 17:27:17 -07:00
Jessie Frazelle 4a25c5d25b Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
 2015-04-20 17:02:43 -07:00
Arnaud Porterie 9838242db1 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
 2015-04-20 15:50:35 -07:00
Phil Estes 435643545c Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
 2015-04-20 17:27:17 -04:00
David Calavera ae4063585e Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:06 -07:00
Alexander Morozov 9e50bf6270 Remove engine from trust 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 12:48:33 -07:00
Alexander Morozov a7690076c9 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
 2015-04-20 11:51:04 -07:00
Phil Estes 490a0bd697 Merge pull request #12545 from coolljt0725/remove_rudundant_enter 
Remove redundant `\n` in daemon/daemon.go
 2015-04-20 14:32:27 -04:00
Srini Brahmaroutu 1a35b16b08 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-20 17:57:53 +00:00
Lei Jitang dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Alexander Morozov d2ce1076a4 Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive 
clenaup: delete unused function getEnv
 2015-04-20 07:50:06 -07:00
Lei Jitang 2d5ede67c0 Remove redundant '\n' in daemon.go and correct the warning messages for memory swap 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 22:00:03 +08:00
Sylvain Baubeau acb6127c1a Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
 2015-04-20 15:13:30 +02:00
Hu Keping f4942ed864 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>
 2015-04-20 18:14:06 +08:00
Ma Shimiao e607bb49c4 clenaup: delete unused function getEnv 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-20 16:32:42 +08:00
Ankush Agarwal edf541c22b gofmt whole directory 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-20 01:08:51 -07:00
Doug Davis b1d8ae3824 Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
 2015-04-19 16:02:28 -04:00
Brian Goff 89092252f0 Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic 
change code to clarify logic
 2015-04-19 07:39:24 -04:00
Simei He 99f6309b97 remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-19 18:36:56 +08:00
Megan Kostick cdc63ce5d0 Updated message severity in graphdriver 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-17 10:56:12 -07:00
Antonio Murdaca 1c89c6ea2f Add minor stylistic fixes 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 21:22:32 +02:00
Antonio Murdaca e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02:00
Yan Feng 7e01ecc119 Fix a typo in docker/daemon/state.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-16 10:56:15 -04:00
Ma Shimiao 93cdb0071b optimize code to clarify logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-16 19:56:25 +08:00
Jessie Frazelle 1899b2f41a Merge pull request #12423 from crosbymichael/idkbutitworks 
Ensure state is destroyed on daemont restart
 2015-04-15 21:19:38 -07:00
Brian Goff de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
Michael Crosby a5f7c4aa31 Ensure state is destroyed on daemont restart 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-04-15 17:44:03 -07:00
Jessie Frazelle 2e4d36ed80 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
 2015-04-15 14:47:12 -07:00
Darren Shepherd 05641ccffc 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>
 2015-04-15 12:46:43 -07:00
Brian Goff f0c60f7085 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
 2015-04-15 14:28:39 -04:00
Brian Goff 2ecccda162 Merge pull request #12139 from hqhq/hq_add_cpusest_mems2 
add support for cpuset.mems
 2015-04-15 13:29:43 -04:00
David Calavera 767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00
Jessica Frazelle b3867b8899 try to modprobe bridge 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-15 07:19:37 -07:00
Deng Guangxing acf025ad1b Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-15 11:51:24 +08:00
Qiang Huang 8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
David Calavera 98996a432e Remove engine.Job from Create action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00
David Calavera 610c436e07 Remove engine.Job from Start action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00