centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 15:58:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 54 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

20092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Murdaca
29c9717cac Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test 
refactor docker_cli_netmode_test .go with Assert statement
 2015-11-01 11:07:54 +01:00
John Howard
8764967381 Windows: Fix daemon\graphdriver\graphtest 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 21:14:18 -07:00
Mary Anthony
5ce093e945 Fixing broken links 
Fixing the weight

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-31 19:45:56 -07:00
John Howard
910e4ba7ed Windows: Factor out user in execdriver\driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 19:19:24 -07:00
Phil Estes
0c57b9f5b3 Fix integration-cli daemon restart with user namespaces enabled 
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-31 14:39:33 -04:00
John Howard
be2f53ece8 Windows: Fix native exec template 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 11:39:19 -07:00
John Howard
96b45e9216 Windows: Fix docker device tool 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 11:32:37 -07:00
Alexander Morozov
4468e1e74e Merge pull request #17567 from Microsoft/10662-lxcunittest 
Windows: Fix go test in execdriver\lxc
 2015-10-31 09:40:19 -07:00
Alexander Morozov
8d584da96e Merge pull request #17568 from Microsoft/10662-journald 
Windows: Fix journald compile error
 2015-10-31 09:35:39 -07:00
John Howard
5452954d89 Windows: Fix journald compile error 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 08:31:25 -07:00
John Howard
30ab497e17 Windows: Fix go test in execdriver\lxc 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-31 08:25:36 -07:00
Arnaud Porterie
5719d01066 Merge pull request #16579 from coolljt0725/fix_attach_paused_container 
Add show error when attach to a paused container
 2015-10-31 07:43:22 -07:00
Alexander Morozov
ed6e3cf704 Merge pull request #17537 from mountkin/fix-logger-race 
fix a race in json logger reader
 2015-10-30 23:00:17 -07:00
Brian Goff
f87082f08e Merge pull request #17545 from LK4D4/writehs_encode 
Use json.Encoder for container.writeHostConfig
 2015-10-30 21:11:15 -04:00
Brian Goff
cccb6bce7d Merge pull request #17524 from mountkin/fix-teardown 
dont try to remove builtin networks in teardown
 2015-10-30 20:59:57 -04:00
Donald Huang
8ceded6d03 add tests for docker stats versioning 
testing for #17549

Signed-off-by: Donald Huang <don.hcd@gmail.com>
 2015-10-31 00:23:08 +00:00
David Calavera
2e466bafda Merge pull request #17548 from mavenugo/ugr 
Vendoring libnetwork to fix #17526 & #17527
 2015-10-30 17:13:40 -07:00
David Calavera
09cb1f1121 Merge pull request #17529 from Microsoft/10662-builderisolation 
Windows: [TP4] Allows --isolation on docker build
 2015-10-30 17:10:04 -07:00
David Calavera
6d8aff07ac Merge pull request #17547 from LK4D4/unn_stat 
Remove unnecessary Stat check from readHostConfig
 2015-10-30 16:56:11 -07:00
David Calavera
9bf20c6847 Merge pull request #17549 from donhcd/fixPre122Stats 
fix pre-1.21 docker stats
 2015-10-30 16:45:41 -07:00
Alessandro Boch
e16e794805 IT for daemon restarts when container connected to multiple networks 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 16:25:25 -07:00
Madhu Venugopal
401632c756 fixing ungraceful daemon restart case where nw connect is not persisted 
For graceful restart case it was done when the container was brought
down. But for ungraceful cases, the persistence is missing for nw
connect

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-30 16:24:02 -07:00
Madhu Venugopal
2361edbcea Vendoring in libnetwork to fix an ungraceful restart case 
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-30 16:24:02 -07:00
David Calavera
a54d5932e3 Turn IPC unmount errors into warnings. 
And do not try to unmount empty paths.

Because nobody should be woken up in the middle of the night for them.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-30 19:13:52 -04:00
Alexandre Beslic
33f5429786 Merge pull request #17538 from calavera/deprecated_bridge_interface 
Fix network inspect for default networks.
 2015-10-30 16:03:51 -07:00
Donald Huang
d2c04f844b fix pre-1.22 docker stats 
This fixes a bug introduced in #15786:

* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629

Signed-off-by: Donald Huang <don.hcd@gmail.com>
 2015-10-30 22:28:03 +00:00
David Calavera
0c991f3d68 Merge pull request #16779 from Microsoft/10662-execdrivercommand 
Windows: Refactor execdriver.Command
 2015-10-30 14:59:59 -07:00
Alexander Morozov
36a69bbc60 Remove unnecessary Stat check from readHostConfig 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-30 14:54:09 -07:00
Alexander Morozov
cf1a6c08fa Use json.Encoder for container.writeHostConfig 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-30 14:45:35 -07:00
Alexander Morozov
23a0fe9627 Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling 
Force IPC mount to unmount on daemon shutdown/init
 2015-10-30 14:40:42 -07:00
David Calavera
85d7bbf7aa Merge pull request #17528 from LK4D4/todisk_encode 
Use json.Encoder for container.toDisk
 2015-10-30 14:36:42 -07:00
Tibor Vass
74362e8392 Merge pull request #17531 from crosbymichael/no-set-reservation 
Don't set mem soft limit if not specifiecd
 2015-10-30 17:01:36 -04:00
Alexandre Beslic
8d7d51190d Merge pull request #17541 from aboch/uc 
Modify IPAMConfig structure json tags
 2015-10-30 14:01:13 -07:00
David Calavera
f301c5765a Fix network inspect for default networks. 
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-30 16:55:21 -04:00
John Howard
9d14866d71 Windows: Refactor execdriver.Command 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 13:53:00 -07:00
John Howard
805dd0eeed Windows: Native ANSI console support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 13:44:04 -07:00
Mike Brown
b1da9fcc84 putting in support for rmi id for legacy docker.io/name images in local repositories 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2015-10-30 15:28:12 -05:00
Alessandro Boch
d795bc7d53 Modify IPAMConfig structure json tags 
- So that it complies with docker convention for inspect

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 12:57:49 -07:00
Brian Goff
78bd17e805 Force IPC mount to unmount on daemon shutdown/init 
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.

This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-30 15:41:48 -04:00
Tibor Vass
a154b95d06 Merge pull request #17536 from aboch/uc 
Modify Network structures json tags
 2015-10-30 15:28:38 -04:00
Shijiang Wei
e41eae8b42 fix a race in json logger reader 
The json decoder starts to decode immediately an inotify event is
received.
But at the time the inotify event is trigged, the json log
entry might haven't been fully written to the disk.
In this case the decoder will return an "io.UnexpectedEOF" error, but
there is still data remaining in the decoder's buffer. And the data
should be passed to the decoder when the next inotify event is
triggered.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-31 02:28:23 +08:00
Alessandro Boch
b2d0b75018 Modify Network structure json tags 
- So that they comply with docker inspect convention
  Which is allowing camel case for json field names

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 11:23:59 -07:00
John Howard
d5c85897f4 Windows: Allows --isolation on docker build 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 11:14:38 -07:00
Jess Frazelle
0aa3bff482 Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild 
Build broken on master (awslogs)
 2015-10-30 10:39:48 -07:00
Brian Goff
17a8fbeaeb Merge pull request #17514 from mavenugo/ugr 
Fixing a case of dangling endpoint during ungraceful daemon restart
 2015-10-30 13:38:27 -04:00
Michael Crosby
ecb87ed0a5 Don't set mem soft limit if not specifiecd 
You cannot do this for individual cgroups for all the containers.  Only
set the reservation if the user requested it.  The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-10-30 10:34:01 -07:00
moxiegirl
aa832d0197 Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions 
Fix ubuntu installation instructions page
 2015-10-30 10:10:04 -07:00
moxiegirl
f714118439 Merge pull request #17447 from ehaydenr/master 
Update kill.md
 2015-10-30 10:07:44 -07:00
John Howard
2716e3964d Windows build broken on master (awslogs) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 10:02:32 -07:00
Tibor Vass
c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver 
[awslogs] Auto-detect region and set user-agent
 2015-10-30 12:38:40 -04:00