Doug Davis
fbd47969a8
TestBuildCancelationKillsSleep send exec cmd to stdout
...
and makes the testing output ugly.
This hides the output since it not used.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-24 20:56:26 -07:00
Simon Eskildsen
67bd859481
listenbuffer: add docs
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
2015-03-25 03:11:34 +00:00
Simon Eskildsen
b6b8032a17
listenbuffer: add test
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
2015-03-25 03:11:33 +00:00
Stephen J Day
ac73963d7e
Add support for configuration static logging fields
...
To allow flexibility in log message context information, this changeset
provides the ability to configure static fields that are included in the
context. Such fields can be set via configuration or environment variables.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-24 18:47:22 -07:00
Richard
c6fdfc9cd5
Attempt to identify remote IP addresses for requests which come
...
through proxies.
Add a function to examine X-Forward-For and X-Real-Ip headers for
originating IP addresses. Use RemoteAddr for notification request
record and HTTP request context.
2015-03-24 18:45:14 -07:00
Doug Davis
0d2190e679
Add some info about what environment variables are available
...
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-24 18:29:21 -07:00
Yestin Sun
a08048d5c8
Add more tests for pkg/chrootarchive
...
Fixes issue #11601
Change-Id: Ifc1dbcc59cc4dc581ed43fc8fbe43fbaec4ccad0
Signed-off-by: Yestin Sun <sunyi0804@gmail.com >
2015-03-24 18:23:28 -07:00
Jimmy Puckett
e8e60befd6
Code simplification that @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-24 21:10:07 -04:00
Jimmy Puckett
ec5e22efe3
Changing bitflag checking style to preferred style. Fixes #11668
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-24 21:09:25 -04:00
Jessie Frazelle
22dba32b4d
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
2015-03-24 17:37:27 -07:00
Michael Crosby
d214e64032
Merge pull request #11018 from delftswa2014/10958-pidfile
...
Moves pid file operations to /pkg/
2015-03-24 17:20:52 -07:00
Stephen J Day
a75f0f26f7
Allow logging formatter to be configured
...
This changeset simply adds hooks into the configuration system to support
multiple different kinds of output formats. These formatters are provided by
logrus and include options such as "text" and "json". The configuraiton
documentation has been updated accordingly.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-24 16:56:43 -07:00
Stephen J Day
00e6b0d2b8
Update logrus dependency in Godep
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-24 16:56:43 -07:00
Stephen Day
73be4d5e3e
Merge pull request #300 from shreyu86/master
...
removing references to chunksize which is optional
2015-03-24 16:48:04 -07:00
Shreyas Karnik
5537bcd4ae
Added valid values to the configuration examples
...
Signed-off-by: Shreyas Karnik <karnik.shreyas@gmail.com >
2015-03-24 18:28:20 -05:00
Arnaud Porterie
8900ae2928
Revert all but TestPullImageFromCentralRegistry changes
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-24 16:27:35 -07:00
Jessie Frazelle
aecc5b606f
Merge pull request #11728 from crosbymichael/lxc-mkdir
...
Mkdir for lxc root dir before setup of symlink
2015-03-24 16:25:12 -07:00
Aanand Prasad
83dcceacaf
Fix regression in Dns and DnsSearch settings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-03-24 16:17:05 -07:00
Shreyas Karnik
98e2aa96de
removing references to chunksize which is optional
2015-03-24 18:16:02 -05:00
Alexandre Beslic
904c720ea5
Merge pull request #446 from vieux/rmi
...
add docker rmi
2015-03-24 16:04:35 -07:00
Arnaud Porterie
322095ed63
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
2015-03-24 16:02:14 -07:00
Victor Vieux
45fc0c9272
Merge pull request #509 from vieux/nodes-discovery-gen
...
Proposal: implement IP generator for nodes and file discoveries by @chanwit
2015-03-24 17:00:48 -06:00
Rick Wieman
772833274f
Moved pidfile from utils to pkg
...
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.
Signed-off-by: Rick Wieman <git@rickw.nl >
2015-03-24 23:59:32 +01:00
Michael Crosby
246cab90f2
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-24 15:53:23 -07:00
Victor Vieux
24093beb85
add quotes in doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-03-24 16:49:18 -06:00
Evan Hazlett
8ab5b87379
use file for downloading b2d iso if no scheme is provided
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-24 15:21:15 -07:00
Ke Zhu
f92f57cd4d
keep global b2d iso cache when using custom b2d iso
...
Signed-off-by: Ke Zhu <kzhu@us.ibm.com >
2015-03-24 15:21:15 -07:00
Evan Hazlett
bde6ad3fac
fixed b2d url bug with fusion / vsphere
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-24 15:21:15 -07:00
Evan Hazlett
2151492dec
fix regression for custom b2d url paths
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-24 15:21:15 -07:00
Michael Crosby
f3fc857e01
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
2015-03-24 14:58:30 -07:00
Matthew Mayer
08d75bc450
Squashed commit of the following:
...
commit d379f7645026001ce57fd6421c819f6c7df77964
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 22:13:06 2015 -0700
Removes unused imports.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
commit 6e1f77c7f1566c8719087d88fbe06bade122691c
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 20:41:16 2015 -0700
Removes bind dir creation in daemon start.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
2015-03-24 14:56:45 -07:00
Michael Crosby
46be6bb403
Merge pull request #11651 from vbatts/vbatts-dont_rm_dockerversion
...
make.sh: leave around the generated version
2015-03-24 14:47:42 -07:00
Alexander Morozov
979283a166
Merge pull request #11726 from noxiouz/history-swap-parallel-assignment
...
History.Swap Use parallel assignment to swap elements
2015-03-24 14:43:44 -07:00
Michael Crosby
73dab8205a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
2015-03-24 14:43:09 -07:00
Alexander Morozov
a4e1de58a3
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
2015-03-24 14:42:02 -07:00
jimmyxian
a153e80f72
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-03-24 15:33:53 -06:00
Anton Tiurin
fc325274e8
History.Swap Use parallel assignment to swap elements, as it's
...
a more idiomatic way for golang than using a temp variable.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-03-25 00:13:13 +03:00
Michael Crosby
46321a1e4f
Merge pull request #11713 from icecrime/update_gitignore
...
Update .gitignore
2015-03-24 14:03:31 -07:00
Alexander Morozov
439e0ab23f
Merge pull request #11712 from 4gh/test_httputils
...
add tests for pkg/httputils
2015-03-24 13:56:31 -07:00
Tibor Vass
28b96cc613
Merge pull request #11663 from arthurbarr/master
...
Fix #11589 by adding README and comments to exported functions
2015-03-24 14:45:05 -06:00
Aanand Prasad
1f06070f12
Merge pull request #1160 from aanand/fix-volume-merging
...
Fix volume merging
2015-03-24 13:40:07 -07:00
Stephen Day
02b8c7b8cf
Merge pull request #294 from fkautz/pr_out_updating_msopentech_azure_sdk_for_go_to_latest_master
...
Updating MSOpenTech/azure-sdk-for-go to latest master
2015-03-24 13:27:19 -07:00
Aanand Prasad
35c6e0314c
Fix volume merging when there's no explicit host path
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-03-24 13:26:36 -07:00
Aanand Prasad
276e43ca6b
Fix service dict merging when only one dict has a volumes key
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-03-24 13:26:36 -07:00
Evan Hazlett
bc9e5c6a04
Merge pull request #868 from ehazlett/bump-version
...
update version
2015-03-24 13:19:00 -07:00
Evan Hazlett
2ca203bddf
update version
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-24 13:18:13 -07:00
Aanand Prasad
b7046777d1
Merge pull request #1161 from aanand/revert-labels-and-dependencies
...
Revert labels and dependencies
2015-03-24 13:05:46 -07:00
Vincent Batts
8fc9e40086
Merge pull request #11417 from rhatdan/btrfs
...
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
2015-03-24 16:00:15 -04:00
Alexander Morozov
131b29f7bc
Merge pull request #10283 from rhatdan/dev
...
We want to allow the sharing of /dev from the host into the container.
2015-03-24 12:57:44 -07:00
Alexander Morozov
f7900cdd67
Merge pull request #11689 from calavera/ipallocator_refactor
...
Use a structure to keep the allocated ips pool.
2015-03-24 12:42:30 -07:00