4dfa996cc2
Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
...
log driver - Interpolate fields into log tag
2015-09-16 23:33:34 -04:00
2d5d606fd3
refactor stats to not use internal data structures
...
- refactor to make it easier to split the api in the future
- addition to check the existing test case and make sure it contains
some expected output
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-16 17:28:52 -07:00
b0b3bc56d0
Merge pull request #16357 from Microsoft/10662-enabledockervolume
...
Windows: Enable docker volume
2015-09-16 16:42:50 -07:00
f7d4b4fe2b
Convert some "daemon" static error strings to the new errocode package format
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-16 16:16:42 -07:00
9ab8c2d92e
Merge pull request #16358 from mrjana/mh
...
Vendoring libnetwork
2015-09-16 15:47:47 -07:00
0ac28f5e48
Merge pull request #16294 from jfrazelle/cleanup-vendor
...
cleanup vendoring of test deps
2015-09-16 15:45:36 -07:00
9a8f1b7673
Merge pull request #16359 from cpuguy83/skip_racey_test
...
Skip racey TestDockerCmdWithTimeout
2015-09-16 18:37:14 -04:00
5cf3a6e010
Skip racey TestDockerCmdWithTimeout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-16 18:36:35 -04:00
3394fedf32
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
2015-09-17 00:23:25 +02:00
3be7146e14
log driver - add ability to interpolate container context into the log tag field
...
Signed-off-by: Philip Monroe <phil@philmonroe.com>
2015-09-16 15:19:28 -07:00
5cbcbfc03c
Merge pull request #16031 from thockin/14069-dns-options
...
Add support for DNS options
2015-09-16 23:59:19 +02:00
a803148bba
Vendoring libnetwork
...
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-16 14:48:42 -07:00
677a6eaf8f
Merge pull request #16261 from vdemeester/integration-dockercmd
...
Move dockerCmd to pkg/integration and add tests to it
2015-09-16 17:40:33 -04:00
42a46ed1a4
Windows: Enabled docker volume
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-16 14:33:13 -07:00
4a2c3733bd
Merge pull request #16351 from mavenugo/vin_ln_kv
...
Vendoring in libnetwork and libkv
2015-09-16 14:10:49 -07:00
3d4685e258
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com>
2015-09-16 14:06:45 -07:00
b9a3660d1e
Merge pull request #16316 from vbatts/vbatts-events
...
daemon/events: let Log be [slightly] blocking
2015-09-16 13:57:06 -07:00
fb01c2ea3c
Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test
...
Skip TestRunDeviceDirectory when no /dev/snd
2015-09-16 13:56:11 -07:00
ac34ce0307
Merge pull request #16305 from estesp/hooks-for-the-hooks-gods
...
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
2015-09-16 13:55:16 -07:00
5b99591e18
Merge pull request #16308 from runcom/graph-unparam
...
graph: remove unused functions parameters
2015-09-16 13:54:23 -07:00
c1e59b94e2
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
2015-09-16 13:43:02 -07:00
74a8f2f668
Merge pull request #15861 from brahmaroutu/gccgo_x86
...
Enable building Docker with gcc-go on x86
2015-09-16 13:29:02 -07:00
f9e9a622f0
Update the instructions for building experimental docker binaries
...
There is no dynbinary target.
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2015-09-16 13:18:32 -07:00
bfc4e38429
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
2015-09-16 13:17:10 -07:00
2c53643b33
adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
...
temporarily disabling registry builds as crypto package is broken with gccgo.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-16 18:56:01 +00:00
814c19591d
Vendoring in libnetwork and libkv
...
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
(Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516 )
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-16 11:54:28 -07:00
88b895111b
Skip TestRunDeviceDirectory when no /dev/snd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-16 14:43:30 -04:00
259a0fb16c
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
2015-09-16 20:29:16 +02:00
a2f545c86d
Clarifying use of flag
...
Updating with Seb's comments
Updating with comments from review
Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-16 11:22:40 -07:00
60db152b20
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
2015-09-16 11:18:17 -07:00
552c361f39
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
2015-09-16 10:01:11 -07:00
50d7fba775
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec816
2015-09-16 09:56:38 -07:00
e148e763b8
Update native execdriver to exploit libcontainer hooks
...
Using @mavenugo's patch for enabling the libcontainer pre-start hook to
be used for network namespace initialization (correcting the conflict
with user namespaces); updated the boolean check to the more generic
SupportsHooks() name, and fixed the hook state function signature.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-16 12:51:14 -04:00
0a5aac1ff6
Fix bash completion when extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-16 18:17:40 +02:00
7b1930063f
Merge pull request #16309 from LK4D4/fix_volumes_race
...
volumes: add synchronization to Count and List
2015-09-16 11:28:51 -04:00
ea4d70bdfd
Add documentation note that LABEL allows environment replacement
...
Signed-off-by: Tim Waugh <twaugh@redhat.com>
2015-09-16 14:47:01 +01:00
e0fee019ca
Merge pull request #16314 from Microsoft/10662-stopsignal2
...
Windows: Turn off TestBuildStopSignal
2015-09-16 09:42:01 -04:00
f2d978ccf9
error should be checked earlier in the hijack function
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-09-16 20:28:07 +08:00
8cfcd87380
incorporate doc review comments
...
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
2015-09-16 03:31:15 -07:00
54240f8da9
Support for passing build-time variables in build context
...
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.
- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.
- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
2015-09-16 03:31:15 -07:00
b0d4e9d1ba
add opensuse to rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-15 16:18:19 -07:00
606c6e8f57
Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
...
updates to readme documents for manual page
2015-09-15 15:18:19 -07:00
be082715c7
Merge pull request #16324 from calavera/update_changelog
...
Update changelog for version 1.8.2.
2015-09-15 14:51:53 -07:00
3b7cdfcd6b
Update changelog for version 1.8.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-15 17:43:37 -04:00
9c9b748ad8
Remove unused variable, fix #16310
...
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com>
2015-09-15 22:20:10 +02:00
fc77ea787e
Revert "Make events test more deterministic in go1.5"
...
This reverts commit 386aefb9fc
2015-09-15 15:55:18 -04:00
6167c7bfb8
Windows: Turn off TestBuildStopSignal
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-15 11:56:54 -07:00
09e7dd03f8
daemon/events: let Log be [slightly] blocking
...
With go1.5's concurrency, the use of a goroutine in Log'ing events was
causing the resulting events to not be in order.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-09-15 14:28:22 -04:00
9b648dfac6
Windows: Fix long path handling for docker build
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-09-15 10:58:11 -07:00
2d21996eec
volumes: add synchronization to Count and List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-15 10:38:53 -07:00
Brian Goff
Morgan Bauer
David Calavera
Doug Davis
Arnaud Porterie
Tibor Vass
Sebastiaan van Stijn
Philip Monroe
Antonio Murdaca
Jana Radhakrishnan
John Howard
Tim Hockin
Jess Frazelle
Alexander Morozov
Tom Denham
Srini Brahmaroutu
Madhu Venugopal
Mary Anthony
Jessica Frazelle
Harald Albers
Tim Waugh
Shijiang Wei
Madhav Puri
Christian Rotzoll
Vincent Batts
Stefan J. Wernli
Alexander Morozov