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

15568 Commits

Author SHA1 Message Date
John Howard 6c187b8b4b Windows: No unix_socket.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-15 15:49:02 -07:00
Alexander Morozov 27b77464d8 Merge pull request #13232 from Microsoft/10662-zfs 
Windows: No ZFS graphdriver
 2015-05-15 11:51:48 -07:00
Alexander Morozov 0db7365c66 Merge pull request #13221 from duglin/ReenableDebug 
add link between -D and --log-level=debug back in
 2015-05-15 11:45:44 -07:00
David Calavera b785e5091f Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
 2015-05-15 11:16:12 -07:00
Alexander Morozov 88127ce475 Merge pull request #13246 from unclejack/refactor_statscollector 
daemon/stats_collector: refactor getSystemCpuUsage
 2015-05-15 11:06:47 -07:00
Michael Crosby 520955b1cf Merge pull request #13236 from vieux/revert_time_change 
Revert "Fix inconsistent date formats in API"
 2015-05-15 10:32:03 -07:00
Alexander Morozov 5d2ef30a38 Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check 
Extend sleep/timeout for ngoroutine check
 2015-05-15 08:57:25 -07:00
Brian Goff 248e5a4c83 Merge pull request #13220 from Microsoft/10662-sysinfo 
Windows: Refactor sysinfo for compilation
 2015-05-15 10:53:55 -04:00
Brian Goff 2c8eba14df Merge pull request #13243 from coolljt0725/remove_redundant_log 
Cleanup:Remove redundant log in pkg/pidfile/pidfile.go
 2015-05-15 10:13:19 -04:00
Brian Goff f207322c0a Extend sleep/timeout for ngoroutine check 
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.

Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-15 09:54:43 -04:00
Shishir Mahajan 8b2c6cb072 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-05-15 09:30:36 -04:00
unclejack 25f776451e daemon/stats_collector: refactor getSystemCpuUsage 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-15 12:22:50 +03:00
Lei Jitang 60e5c273cf Remove redundant log in pkg/pidfile/pidfile.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-15 15:26:00 +08:00
Victor Vieux b261ce5fb0 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-14 17:31:45 -07:00
David Calavera e4855eebf2 Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339 
Parse input timestamps with standard RFC3339
 2015-05-14 16:49:01 -07:00
John Howard 35cdcbb323 Windows: No ZFS graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-14 15:57:45 -07:00
Tibor Vass c5240d79e3 Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor 
Windows: Start of daemon config refactor
 2015-05-14 14:55:22 -07:00
Brian Goff a4592467e7 Merge pull request #13223 from Microsoft/10662-loggers 
Windows: Factor out syslog and journald
 2015-05-14 16:26:43 -04:00
Alexander Morozov b2ad9314a2 Merge pull request #13196 from crosbymichael/update-libocntainer-may13 
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
 2015-05-14 10:49:25 -07:00
John Howard 655a58e27b Windows: Factor out syslog and journald 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-14 10:34:09 -07:00
Doug Davis a85ca8b7c4 add link between -D and --log-level=debug back in 
Due to popular demand :-)
See #11965

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 10:29:49 -07:00
John Howard b7ee717a10 Windows: Refactor sysinfo for compilation 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-14 09:44:51 -07:00
Alexander Morozov fe6f77df2c Merge pull request #13087 from duglin/FixNatTest 
Fix random errors in DockerSuite.TestNetworkNat
 2015-05-14 08:35:27 -07:00
Brian Goff ac81cd1fc3 Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
 2015-05-14 10:36:50 -04:00
Doug Davis 1c5a4728e1 Merge pull request #13208 from ahmetalpbalkan/nit 
Remove out of date comment
 2015-05-14 06:59:21 -07:00
Doug Davis 3f4926e49b Fix a regression in `docker import` on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan 999f464feb Parse input timestamps with standard RFC3339 
Fix for #13175.

This change allows user-input timestamps (e.g. to `docker events
--since/--until`  or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).

User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.

Added test case for `events --since/--until` with all possible
timestamp input formats.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-14 07:44:42 +00:00
Ahmet Alp Balkan 9448d3627b Remove out of date comment 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-14 07:37:31 +00:00
Sebastiaan van Stijn 1d57642906 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
 2015-05-13 20:23:19 -07:00
Hu Keping 945fc9d882 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-14 18:58:55 +08:00
Sebastiaan van Stijn ed25742002 Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
 2015-05-13 18:30:32 -07:00
Darren Shepherd f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Brian Goff f2bc54f796 Merge pull request #13201 from Microsoft/10662-fixdebugtrap 
Fix package on debugtrap_unsupported.go
 2015-05-13 20:44:13 -04:00
Brian Goff feb0fa8dbf Merge pull request #13112 from hqhq/hq_fix_oonkilldisable 
Fix oom kill disable issue
 2015-05-13 20:03:33 -04:00
John Howard 1e78eec826 Fix package on debugtrap_unsupported.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-13 16:38:59 -07:00
Antonio Murdaca b37abf2528 Merge pull request #13146 from rajdeepd/dry-run-test-1 
Modified Test Case to include check for Memory and MemorySwap
 2015-05-14 01:10:35 +02:00
Alexander Morozov 64ea54c0ed Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot 
Minor typo: remove redundant dot in error message in runconfig/parse.go
 2015-05-13 15:24:01 -07:00
Michael Crosby 677d76cd4a Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-13 15:02:53 -07:00
moxiegirl 32f8a40398 Merge pull request #13193 from moxiegirl/dhe-commercial-release 
adding release note for 1.6.2
 2015-05-13 14:51:50 -07:00
Alexander Morozov 31c8112285 Merge pull request #13194 from crosbymichael/merge_release_v1.6.2 
Merge release 1.6.2
 2015-05-13 14:01:40 -07:00
Michael Crosby 87c35d0e0a Update libcontainer to a37b2a4f152e2a1c9de596f54c0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-13 13:55:26 -07:00
Mary Anthony 6c17b4818d adding release note for 1.6.2 
Signed-off-by: Mary Anthony <mary@docker.com>

ugh, cut n paste

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-13 13:54:30 -07:00
Michael Crosby cec64ebef8 Bump to version 1.6.2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	VERSION
 2015-05-13 13:51:39 -07:00
Rajdeep Dua 1eea2c589d Modified Test Case to include check for Memory and MemorySwap 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-05-13 13:39:07 -07:00
Alexander Morozov 877461bc20 Merge pull request #13190 from unclejack/precompile_regexp 
Precompile regexp
 2015-05-13 13:00:14 -07:00
David Calavera 3da0013ac4 Merge pull request #13155 from coolljt0725/fix_validate_tag_name 
Fix validate tag name. Fix #13149
 2015-05-13 12:03:22 -07:00
Michael Crosby c46c8f4e40 Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase 
Fix mangled hack/vendor.sh rebase
 2015-05-13 12:02:07 -07:00
Tianon Gravi c2d6187811 Fix mangled hack/vendor.sh rebase 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-13 12:52:59 -06:00
unclejack cb08c1173f pkg/stringid: precompile regexp 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-13 21:48:48 +03:00
unclejack 8f57e7d2ef image: precompile regexp 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-13 21:47:43 +03:00