centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 02:38:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 56 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

2572 Commits

Author SHA1 Message Date
Michael Crosby
010470dd53 Merge pull request #13893 from mrunalp/update_libcontainer 
Updates libcontainer to v2.2.1
 2015-06-17 10:47:49 -07:00
John Howard
3c177dc877 Windows: Docker build starting to work 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-17 10:41:28 -07:00
Antonio Murdaca
b6a6c56915 Remove missed code path for api < 1.12 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-17 17:00:48 +02:00
Alexander Morozov
9ad87523c0 Merge pull request #13292 from coolljt0725/add_bridge_nf_to_docker_info 
Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info
 2015-06-16 22:15:48 -07:00
Phil Estes
a27d8f9aa4 Merge pull request #13975 from stevvooe/move-setup-init-layer 
Move graph.SetupInitLayer to daemon package where it is used
 2015-06-16 22:37:51 -04:00
Lei Jitang
57d12a0e0a Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-17 09:19:11 +08:00
Vivek Goyal
c06b05b11e devicemapper: Compare uuid of base device on startup 
It is easy for one to use docker for a while, shut it down and restart
docker with different set of storage options for device mapper driver
which will effectively change the thin pool. That means any of the
metadata stored in /var/lib/docker/devicemapper/metadata/ is not valid
for the new pool and user will run into various kind of issues like
container not found in the pool etc.

Users think that their images or containers are lost but it might just
be the case of configuration issue. People might use wrong metadata
with wrong pool.

To detect such situations, save UUID of base image and once docker
starts later, query and compare the UUID of base image with the
stored one. If they don't match, fail the initialization with the
error that UUID failed to match.

That way user will be forced to cleanup /var/lib/docker/ directory
and start docker again.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-06-16 21:12:27 -04:00
Stephen J Day
b7f887a9a2 Move graph.SetupInitLayer to daemon package where it is used 
An inspection of the graph package showed this function to be way out of place.
It is only depended upon by the daemon code. The function prepares a top-level
readonly layer used to provide a consistent runtime environment for docker
images.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-16 16:50:56 -07:00
Arnaud Porterie
cb979edec0 Fix typo in lxc_template.go 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-16 15:19:43 -07:00
Alex Samorukov
6089e679a2 Make LXC exec driver compatible with recent LXC where lxc.autodev is enabled by default 
Update LXC to 1.1.2

Signed-off-by: Alex Samorukov <samm@os2.kiev.ua>
 2015-06-16 15:19:00 -07:00
Vincent Batts
e69df2589c Merge pull request #13198 from rhvgoyal/extend-docker-inspect 
docker-inspect: Extend docker inspect to export image metadata related to graph driver
 2015-06-16 15:03:14 -05:00
Brian Goff
49834e8d59 Fix circular import for windows vfs graphdriver 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-16 09:08:10 -04:00
Brian Goff
9dffd032f4 Merge pull request #13950 from Microsoft/10662-vfsforreal 
Windows - Really fix VFS this time
 2015-06-15 21:41:12 -04:00
Michael Crosby
ff4e58ff56 Get Mtu from default route 
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface.  If there is no default route, default to a
mtu of 1500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-06-15 16:33:02 -07:00
Mrunal Patel
6d022bda3b Updates libcontainer to v2.2.1 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-06-15 18:18:38 -04:00
John Howard
59cfc08982 Windows - Really fix VFS this time 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-15 15:09:48 -07:00
Antonio Murdaca
835f1c9116 Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container 
Correct the message of pause and unpause a non-running container
 2015-06-15 23:56:32 +02:00
Vivek Goyal
407a626be6 docker-inspect: Extend docker inspect to export image/container metadata related to graph driver 
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.

This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-06-15 14:05:10 -04:00
Alexander Morozov
1157fcc4a4 Merge pull request #13926 from Microsoft/10662-createfixup 
Windows: Fixup compile in daemon_windows.go
 2015-06-15 10:17:24 -07:00
moxiegirl
ee40f29712 Merge pull request #13927 from moxiegirl/carry-13250 
Carry of PR #13520
 2015-06-13 10:29:56 -07:00
Tibor Vass
f27c9bc6e7 Merge pull request #13895 from calavera/fix_get_env_split 
Correct getEnv split.
 2015-06-13 12:43:45 -04:00
Mary Anthony
cd44018856 Carry of PR #13520 
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-13 09:27:30 -07:00
John Howard
c7975f12d6 Windows: Fixup compile in daemon_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-13 09:10:54 -07:00
Arnaud Porterie
261af00282 Merge pull request #13682 from mavenugo/ln_vin 
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
 2015-06-13 09:00:33 -07:00
Lei Jitang
b37832e353 Add verify config to verifyContainerSettings 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-13 09:31:19 +08:00
Madhu Venugopal
083300168f Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564 
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-12 16:10:40 -07:00
David Calavera
e7533d7f81 Merge pull request #13494 from Microsoft/10662-vfsdriveroption 
Windows: Allow VFS
 2015-06-12 11:12:32 -07:00
Brian Goff
855a056af7 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-12 13:06:06 -04:00
John Howard
e89f837bc6 Windows: Allow VFS 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-12 09:21:17 -07:00
Arnaud Porterie
00b8fec75f Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation 
refactor: separate graph from image
 2015-06-11 17:44:37 -07:00
David Calavera
85f895ce68 Correct getEnv split. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-11 14:40:46 -07:00
Jessie Frazelle
cada9b54b5 Merge pull request #13865 from Mic92/zfs-selinux 
zfs: correctly apply selinux context
 2015-06-11 12:42:06 -07:00
Jörg Thalheim
19c31a703f zfs: correctly apply selinux context 
fixes #13858

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-06-11 11:11:37 +02:00
Arnaud Porterie
883d661b69 Merge pull request #13867 from calavera/fix_daemon_cleanup_order 
Cleanup driver and graph db after stopping containers.
 2015-06-10 17:05:41 -07:00
David Calavera
0964a664e8 Cleanup driver and graph db after stopping containers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-10 16:11:50 -07:00
Arnaud Porterie
9da65ed84f Merge pull request #13854 from crosbymichael/revert-shared-root 
Revert shared container rootfs
 2015-06-10 14:12:14 -07:00
Tibor Vass
add64dc297 Merge pull request #13832 from mapk0y/fix-error-msg 
fix typo.
 2015-06-10 16:38:07 -04:00
Brian Goff
05644ccea9 Merge pull request #13272 from Microsoft/10662-daemonrefactorv2 
Windows: Refactor daemon
 2015-06-10 16:28:56 -04:00
John Howard
8fb0ca2c35 Windows: Refactor daemon 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 12:42:43 -07:00
Michael Crosby
c9d71317be Revert shared container rootfs 
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-06-10 11:29:27 -07:00
Marius Sturm
96d06e106f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
 2015-06-10 20:21:50 +02:00
Doug Davis
46af724e81 Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
 2015-06-10 08:32:57 -07:00
Tibor Vass
de90aef411 Merge pull request #12813 from Microsoft/10662-nolinuxgraph 
Windows: Don't build Linux graph drivers
 2015-06-10 10:01:50 -04:00
Arnaud Porterie
55bdb51659 Merge pull request #13699 from calavera/volume_backwards 
Allow to downgrade local volumes from > 1.7 to 1.6.
 2015-06-09 19:51:06 -07:00
David Calavera
bd9814f0db Allow to downgrade local volumes from > 1.7 to 1.6. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-09 18:04:59 -07:00
Michael Crosby
4750e1f77e Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
 2015-06-09 17:24:30 -07:00
mapk0y
416e855e9b fix typo. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2015-06-10 06:26:07 +09:00
Ma Shimiao
73bc885b23 daemon: cleanup getting container logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-06-09 14:47:07 +08:00
John Howard
9a9dc5ba96 Windows: Don't build Linux graph drivers 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-08 15:09:33 -07:00
John Howard
71eadd4176 Windows: Fix PR13278 compile break 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-08 13:47:09 -07:00