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

15552 Commits

Author SHA1 Message Date
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
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
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
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
Alexander Morozov 1b678f86b3 Merge pull request #13174 from ahmetalpbalkan/TestLogsSince 
integ-cli: Fix race in TestLogsSince
 2015-05-13 11:35:17 -07:00
Jessie Frazelle ebe9a85486 Merge pull request #13183 from runcom/fix-typo-tests-grouping 
Fix typo to run tests grouped by RunUnprivileged
 2015-05-13 11:33:14 -07:00
David Calavera 951c2ef2c9 Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring 
daemon: Logging drivers architectural refactoring
 2015-05-13 11:00:50 -07:00
Brian Goff 8eac7d0779 Merge pull request #13180 from unclejack/fix_test_name 
integcli: change Dettach to Detach
 2015-05-13 09:07:18 -04:00
Antonio Murdaca a36f6a140b Fix typo to run tests grouped by RunUnprivileged 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 14:24:54 +02:00
unclejack fdec5197f1 integcli: change Dettach to Detach 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-13 12:49:19 +03:00
Lei Jitang e00cfbb6f2 Fix invalid tag name 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-13 14:28:52 +08:00
Antonio Murdaca 3401ee13f8 Merge pull request #13169 from jfrazelle/cleanup-integration 
cleanup test-integration
 2015-05-13 06:34:30 +02:00
Antonio Murdaca 56847ec4d4 Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
 2015-05-13 05:23:56 +02:00
Lei Jitang c6dad07b1b Minor typo: remove redundant dot in error message in runconfig/parse.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-13 11:04:07 +08:00
Ahmet Alp Balkan 2fe2f7a186 integ-cli: Fix race in TestLogsSince 
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-13 02:59:11 +00:00
Jessie Frazelle 36d995a291 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
 2015-05-12 18:24:04 -07:00
Tibor Vass 3985f17812 Merge pull request #13131 from Microsoft/10662-loadonwindows 
Windows: Build load.go
 2015-05-12 18:04:33 -07:00
Brian Goff ec4baad954 Merge pull request #13166 from runcom/small-streamformatter-refactor 
Refactor pkg/stremformatter - custom constructors
 2015-05-12 20:28:18 -04:00
Doug Davis 0024935f64 Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-12 17:22:41 -07:00
Jessie Frazelle df89008f0c Merge pull request #13099 from Microsoft/10662-pkgparsers 
Windows: Implement parsers:kernel+os
 2015-05-12 16:07:43 -07:00