centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 23:06:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,230 Commits 58 Branches 28 Tags
4d88bf3ecb0cb5c8a9bc7310ce13fc7ea4afd1ad
Commit Graph

1338 Commits

Author SHA1 Message Date
Tibor Vass
79d086c47d Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver 
Windows: Move workdir check daemon-side
 2015-05-01 00:24:40 -04:00
Michael Crosby
66077a9d69 Merge pull request #12767 from Microsoft/10662-commitdefertarclose 
Windows: Commit() rwTar defer close
 2015-04-30 18:06:09 -07:00
Tibor Vass
e9c9682333 Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor 
Windows: Start refactor execdriver/driver.go
 2015-04-30 20:36:10 -04:00
John Howard
10e2dbf375 Windows: Factor out LXC 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:28:35 -07:00
John Howard
b255c565ca Windows: Start refactor execdriver/driver.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:21:04 -07:00
John Howard
03eb0d065d Windows: Move workdir check daemon-side 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:16:45 -07:00
John Howard
f9c7772b83 Windows: Commit() rwTar defer close 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 12:17:33 -07:00
Antonio Murdaca
531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Phil Estes
2c4fe2aba3 Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term 
Add error check before getting term
 2015-04-29 17:57:01 -04:00
Alexander Morozov
6c46c9c839 Merge pull request #11526 from mizzy/append-drop-rule-not-insert 
Append DROP rule with --icc=false, not insert
 2015-04-29 10:28:11 -07:00
Jessie Frazelle
53bef64804 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
 2015-04-29 10:00:41 -07:00
Brian Goff
d2f0b9ed97 Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers 
Expose the getResourcePath and getRootResourcePath wrappers.
 2015-04-28 18:45:36 -04:00
Phil Estes
67da055ceb Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json 
Fix undead containers
 2015-04-28 08:11:40 -04:00
Jessica Frazelle
2afcd10202 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-27 17:50:39 -07:00
Phil Estes
0153edcda1 Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
 2015-04-27 17:05:46 -04:00
Brian Goff
c3c08f76be Fix undead containers 
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-27 16:45:51 -04:00
David Mackey
3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Antonio Murdaca
844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
David Calavera
f9c27bda1e Merge pull request #12819 from Microsoft/10662-volumesrefactor 
Windows: Refactor volumes
 2015-04-27 10:25:41 -07:00
Tibor Vass
4ddd448490 Merge pull request #12793 from runcom/bye-unmarshal 
Replace json.Unmarshal() with json.Decoder().Decode()
 2015-04-27 13:19:43 -04:00
Brian Goff
97b35bab81 Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows 
Windows: Info no containerized check
 2015-04-27 12:56:28 -04:00
John Howard
ba1725a94e Windows: Refactor volumes 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-27 09:27:15 -07:00
Brian Goff
6856c69c41 Merge pull request #12807 from jmzwcn/patch-2 
Remove dead code from daemon/daemon.go
 2015-04-27 12:10:30 -04:00
Jessie Frazelle
9f684c8592 Merge pull request #12714 from noxiouz/fix_race_stats_collector 
statsCollector: fix data race in run()
 2015-04-27 10:57:56 -05:00
John Howard
ab97303cae Windows: Info no containerized check 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-27 08:38:01 -07:00
Aidan Hobson Sayers
f30d1c1835 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-04-27 14:57:37 +01:00
jmzwcn
accbbfeae4 Remove dead code from daemon/daemon.go 
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2015-04-27 15:50:47 +08:00
Antonio Murdaca
26543e0309 Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-26 15:02:01 +02:00
John Howard
ae9905ef9c Fixed typo 'configuring' 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-24 16:52:32 -07:00
Anton Tiurin
11a5f1af01 statsCollector: fix data race in run() 
statsCollector.publishers must be protected to prevent
modifications during the iteration in run().
Being locked for a long time is bad, so pairs of containers &
publishers (pointers) are copied to release the lock fast.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-04-24 21:07:48 +03:00
Aleksa Sarai
4377ebd6a7 *: expose getResourcePath and getRootResourcePath wrappers 
Due to the importance of path safety, the internal sanitisation wrappers
for volumes and containers should be exposed so other parts of Docker
can benefit from proper path sanitisation.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2015-04-24 23:53:47 +10:00
Michael Crosby
c26695cf8a Merge pull request #12659 from dqminh/exec-interactive-hang 
reuse same code for setting pipes in run/exec
 2015-04-23 16:37:49 -07:00
Jessie Frazelle
2ebfc7c874 Merge pull request #12710 from runcom/bye-engine-from-graph 
Remove engine/job from graph
 2015-04-23 15:42:50 -07:00
Daniel, Dao Quang Minh
ade8146aa8 reuse same code for setting pipes in run/exec 
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-23 21:54:21 +00:00
Antonio Murdaca
fa2c68a89e Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 23:36:29 +02:00
Tibor Vass
259effc6df Merge pull request #9397 from jpopelka/9395-firewalld 
Firewalld support
 2015-04-23 16:58:08 -04:00
Ma Shimiao
dde0cc78bd Move setHostConfig to daemon file 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-23 10:23:02 +08:00
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
Gosuke Miyashita
90a8e45604 Append icc related iptables rules, not INSERT 
Signed-off-by: Gosuke Miyashita <gosukenator@gmail.com>
 2015-04-22 11:45:46 +09: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