Commit Graph

20092 Commits

Author SHA1 Message Date
David Calavera
bfc4e38429 Merge pull request #16320 from 0xfoo/remove-unused-var
Remove unused variable, fix #16310
2015-09-16 13:17:10 -07:00
Srini Brahmaroutu
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
Madhu Venugopal
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
Brian Goff
88b895111b Skip TestRunDeviceDirectory when no /dev/snd
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-16 14:43:30 -04:00
Sebastiaan van Stijn
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
Mary Anthony
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
David Calavera
60db152b20 Merge pull request #16292 from tpounds/fix-doc-typo
Fix minor documentation typo.
2015-09-16 11:18:17 -07:00
David Calavera
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
Jessica Frazelle
50d7fba775 Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-16 09:56:38 -07:00
Madhu Venugopal
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
Harald Albers
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
Brian Goff
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
Tim Waugh
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
Brian Goff
e0fee019ca Merge pull request #16314 from Microsoft/10662-stopsignal2
Windows: Turn off TestBuildStopSignal
2015-09-16 09:42:01 -04:00
Shijiang Wei
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
Madhav Puri
8cfcd87380 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
2015-09-16 03:31:15 -07:00
Madhav Puri
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
Jessica Frazelle
b0d4e9d1ba add opensuse to rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-15 16:18:19 -07:00
moxiegirl
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
Jess Frazelle
be082715c7 Merge pull request #16324 from calavera/update_changelog
Update changelog for version 1.8.2.
2015-09-15 14:51:53 -07:00
David Calavera
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
Christian Rotzoll
9c9b748ad8 Remove unused variable, fix #16310
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com>
2015-09-15 22:20:10 +02:00
Vincent Batts
fc77ea787e Revert "Make events test more deterministic in go1.5"
This reverts commit 386aefb9fc.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-09-15 15:55:18 -04:00
John Howard
6167c7bfb8 Windows: Turn off TestBuildStopSignal
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-15 11:56:54 -07:00
Vincent Batts
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
Stefan J. Wernli
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
Alexander Morozov
2d21996eec volumes: add synchronization to Count and List
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-15 10:38:53 -07:00
Mike Brown
96699e06dd updates to readme documents for manual page
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-15 12:08:02 -05:00
Brian Goff
59311faaed Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
Remove volume references when container creation fails.
2015-09-15 10:55:51 -04:00
Antonio Murdaca
723f587b56 graph: remove unused functions parameters
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-15 15:34:15 +02:00
Brian Goff
e91f2c26ce Merge pull request #15069 from duglin/UseErrorPackage
Use the new error package
2015-09-15 09:28:53 -04:00
Flavio Castelli
5d6bb52976 Update SUSE docs
Clarify some parts of the document, add extra resources link.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-09-15 14:46:46 +02:00
Antonio Murdaca
db2ac8655d Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
Fix container register failed during daemon start and then start the container
2015-09-15 11:46:03 +02:00
Antonio Murdaca
0d873f6e70 Merge pull request #16279 from coolljt0725/clean_up
Clean up: remove redundant value assign in runconfig/parse.go
2015-09-15 11:43:38 +02:00
Hu Keping
d3379946ec Refactor the statistics of network in docker stats
For now docker stats will sum the rxbytes, txbytes, etc. of all
the interfaces.

It is OK for the output of CLI `docker stats` but not good for
the API response, especially when the container is in sereval
subnets.

It's better to leave these origianl data to user.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-15 15:40:34 +08:00
Sebastiaan van Stijn
99b40d1e14 Merge pull request #16295 from BWITS/master
typo
2015-09-15 08:42:04 +02:00
Phil Estes
370ca6e401 Merge pull request #16282 from mavenugo/ln_uns
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
2015-09-14 22:18:50 -04:00
Bill W
386b7bc71b typo
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
2015-09-15 11:58:20 +10:00
Jessica Frazelle
8ef7aaf885 cleanup vendoring of test deps
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-14 17:38:50 -07:00
Stephen Day
58d6919183 Merge pull request #16197 from aaronlehmann/carry-15539
Carry #15539: Avoid redundant HEAD requests on push
2015-09-14 17:15:32 -07:00
Trevor Pounds
2eedaf0389 Fix minor documentation typo.
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
2015-09-14 17:08:04 -07:00
Brian Goff
a90ed92df0 Merge pull request #16283 from nalind/journald-not-nil
Remove unnecessary check for nil CString
2015-09-14 19:45:36 -04:00
David Calavera
7ce270d4ea Merge pull request #15931 from vdemeester/api-client-ps-coverage
Add more unit tests on api/client/ps package
2015-09-14 14:02:49 -07:00
David Calavera
bda964d085 Merge pull request #16247 from calavera/unexport_volumedriver_interface
Unexport VolumeDriver.
2015-09-14 13:47:00 -07:00
David Calavera
2c6c07752c Remove volume references when container creation fails.
Volumes are accounted when a container is created.
If the creation fails we should remove the reference from the counter.
Do not log ErrVolumeInUse as an error, having other volume references is
not an error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-14 16:16:46 -04:00
David Calavera
fedecb8c91 Merge pull request #16276 from Mashimiao/typo-fix-opts-split
opts/opts.go: fix typo
2015-09-14 13:12:16 -07:00
Doug Davis
628b9a41b0 Use the new error package
This is the first step in converting out static strings into well-defined
error types.  This shows just a few examples of it to get a feel for how things
will look. Once we agree on the basic outline we can then work on converting
the rest of the code over.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-14 13:11:01 -07:00
Nalin Dahyabhai
11fda783f8 Remove unnecessary check for nil CString
@noxiouz points out that we don't need to check for a nil result from
C.CString(), since an out-of-memory condition causes a runtime panic
instead.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-09-14 14:16:48 -04:00
Derek McGowan
5e11cd43aa Ignore ping errors in notary repository setup
Notary is capable of acting in offline mode, making use of cache TUF data.
When ping is not successful, notary should still be attempted without error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-09-14 11:08:25 -07:00
Madhu Venugopal
d0e0c13b60 Vendor-in 2baa2ddc78b42f011f55633282ac63a72e1b09c1 for userns support
Changes include :
* libnetwork support for userns
* driver api change to have 1 interface per endpoint

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-09-14 11:04:12 -07:00