docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-03 11:12:47 +03:00
Code Activity
16,124 Commits 89 Branches 28 Tags
65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Commit Graph

1577 Commits

Author SHA1 Message Date
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
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
Jana Radhakrishnan
c68e7f96f9 libnetwork: Add garbage collection trigger 
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-06-07 21:33:51 -07:00
Lei Jitang
67552fb22d Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-08 09:06:58 +08:00
Doug Davis
07b22fcf50 Merge pull request #13787 from runcom/check-nil-Config 
Avoid nil pointer dereference while creating a container with an empty Config
 2015-06-07 12:28:41 -04:00
Alexander Morozov
3d10540bc3 Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please 
Restore --default-gateway{,-v6} daemon options.
 2015-06-06 16:02:59 -07:00
Antonio Murdaca
4ce817796e Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-06 20:07:32 +02:00
Alexander Morozov
078b8e54e4 Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh 
fix lxc build
 2015-06-05 10:27:58 -07:00
Jessica Frazelle
0adfb908a6 fix lxc build 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-05 09:50:30 -07:00
Phil Estes
edb7e84ddb Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs 
Fix goroutine leak on logs -f with no output
 2015-06-05 11:43:47 -04:00
Eric-Olivier Lamey
5fa60149e2 Restore --default-gateway{,-v6} daemon options. 
This was added before the libnetwork merge, and then lost. Fixes #13755.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-05 06:21:22 +00:00
Brian Goff
a2602c617d Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info 
Cleanup Daemon.verifyVolumesInfo() a bit
 2015-06-04 15:39:31 -07:00
Brian Goff
0c84604f54 Fix goroutine leak on logs -f with no output 
Also noticed potential hang when only stdout or stderr are used with
follow=1

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-04 13:56:40 -07:00
Arnaud Porterie
b63ec6e4b1 Merge pull request #13734 from aboch/master 
Fix for #13720. Unpublished ports missing in docker ps
 2015-06-04 12:05:47 -07:00
Michael Crosby
b26428257f Merge pull request #13728 from calavera/copy_old_volume_content 
Migrate data from old vfs paths to new local volumes path.
 2015-06-04 11:14:34 -07:00
David Calavera
16a5590c5b Migrate data from old vfs paths to new local volumes path. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-04 10:16:19 -07:00
Alexander Morozov
9069cded57 Merge pull request #13586 from kvasdopil/zfs-88chars 
Avoid 88-chars mountpoint length limit on freebsd
 2015-06-04 10:05:01 -07:00
Alessandro Boch
ea180a73bc Fix for #13720 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-06-03 23:39:27 -07:00
Madhu Venugopal
83208a531d Using container NetworkDisabled to fix #13725 
container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725.

There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-03 17:31:22 -07:00
Sebastiaan van Stijn
0636bb7b73 Merge pull request #13672 from LK4D4/syslog_tag 
Add syslog-tag option
 2015-06-03 17:04:59 +02:00
Zefan Li
8b4c0decfc Cleanup Daemon.verifyVolumesInfo() a bit 
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.

Signed-off-by: Zefan Li <lizefan@huawei.com>
 2015-06-03 09:19:16 +08:00
Antonio Murdaca
6deaa58ba5 Expose old config field for api < 1.19 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-06-02 23:37:59 +02:00
Alexander Morozov
a81af2e26a Add syslog-tag option for syslog log-driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:43:00 -07:00
Alexander Morozov
9f098cabfc Merge pull request #13664 from runcom/dead-code 
Remove old struct
 2015-06-02 09:37:55 -07:00
Antonio Murdaca
da1a77defd Remove old struct 
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
 2015-06-02 16:10:39 +02:00
Jessie Frazelle
1f472c3768 Merge pull request #13536 from Mic92/master 
remove redundant mount/unmount calls on commit
 2015-06-01 15:57:14 -07:00
Alexander Morozov
cd80a61cc1 Merge pull request #13443 from duglin/CleanupEvents 
Cleanup container LogEvent calls
 2015-06-01 14:04:33 -07:00
Doug Davis
8232312c1e Cleanup container LogEvent calls 
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.

Added testcases for new events: commit, copy, resize, attach, rename, top

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-01 12:39:28 -07:00
Alexander Morozov
24fbcffeac Merge pull request #13560 from Microsoft/10662-statscollector 
Windows: Factor out stat collector
 2015-06-01 11:39:19 -07:00
Brian Goff
d156bc9dd4 Merge pull request #13637 from LK4D4/remove_debug 
Remove useless debug message
 2015-06-01 11:38:05 -07:00
Alexander Morozov
f1b59d64d2 Remove useless debug message 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-01 11:15:15 -07:00
Brian Goff
a7005c44b5 Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage 
Add docker stats --no-stream show cpu usage
 2015-06-01 09:40:04 -07:00
David Calavera
6fb454b9f0 Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices 
Fixes issue #10184.
 2015-06-01 09:30:04 -07:00
John Howard
68c879406b Windows: Factor out stat collector 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-01 09:11:03 -07:00
Brian Goff
b445004364 Merge pull request #13390 from mrjana/cnm_integ 
Do not attempt releasing network when not attached to any network
 2015-06-01 08:25:20 -07:00
Lei Jitang
96123a1fd5 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-31 01:25:51 +08:00
Doug Davis
dc697b1c9f Add a "Created" state for new containers that haven't been run yet 
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-30 07:48:46 -07:00
David R. Jenni
c913c9921b Fix issue #10184. 
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.

Signed-off-by: David R. Jenni <david.r.jenni@gmail.com>
 2015-05-30 11:09:47 +02:00
David Calavera
04c6f09fbd Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown 
Ensure all the running containers are killed on daemon shutdown
 2015-05-29 16:45:57 -07:00
David Calavera
eaa9c1b97e Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all 
fix bug with rmi multiple tag
 2015-05-29 15:10:22 -07:00
David Calavera
ec167972bf Merge pull request #13446 from runcom/remove-PortSpecs 
Remove PortSpecs from Config
 2015-05-29 14:31:48 -07:00
Jessie Frazelle
a39de41871 Merge pull request #13527 from duglin/FixImagesPrefixNotFound 
Fix error when trying to delete an image due to a bad container
 2015-05-29 14:09:26 -07:00
Jessica Frazelle
185f392691 fix bug with rmi multiple tag 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 14:04:06 -07:00
Antonio Murdaca
15134a3320 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:09 +02:00