Commit Graph

21804 Commits

Author SHA1 Message Date
e3fa9b6aba Skipping two tests when running with GCCGO (CI)
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: dc813c7d137d3e673b68ad4a2996f254d195f1d9
Component: engine
2015-10-21 17:53:59 +00:00
d9fd855cee Merge pull request #17179 from tonistiigi/17178-dont-overwrite-layer-checksum
Don’t overwrite layer checksum on push
Upstream-commit: 10430fd334b7d53146a05083beddfc8c6a8cac91
Component: engine
2015-10-21 13:42:59 -04:00
6672204b41 Merge pull request #17136 from gesellix/change-route-volume-create
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
53531be5ba Wire up libnetwork with TLS discovery options
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.

TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 10e7806984947304767690785b6fb329fd93283a
Component: engine
2015-10-21 09:38:58 -07:00
2bfb10b6f8 Vendoring in libnetwork for the anonymous endpoint
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
f1b2a78ca3 Move volume name validation to the local driver.
Delegate validation tasks to the volume drivers. It's up to them
to decide whether a name is valid or not.
Restrict volume names for the local driver to prevent creating
mount points outside docker's volumes directory.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d6d60287ee3a8a064340582d65c131181ae77127
Component: engine
2015-10-21 12:28:26 -04:00
566b3febc4 Fix layer compression regression
PR #15493 removed compression of layers when pushing them to a V2
registry. This this makes layer uploads larger than they should be.

This commit restores the compression. It uses an io.Pipe to turn the
gzip compressor output Writer into a Reader, so the ReadFrom method can
be used on the BlobWriter (which is very important for avoiding many
PATCH requests per layer).

Fixes #17209
Fixes #17038

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4dce280d96797b6a82e3eb54243e21bce7f55e5d
Component: engine
2015-10-21 09:21:14 -07:00
954f6f9002 ProcessWord support UTF-8
modified PorcessWord to working normally for UTF-8 strings and added test cases

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: bb79b7eb9e1db83fd80121b088aa2e5a4c084ace
Component: engine
2015-10-21 10:10:10 -06:00
b1184809c8 Merge pull request #17229 from mavenugo/ds_fix
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
4f80c1b7df docs: Add Netshare volume plugin to extend/plugins
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
Upstream-commit: 95c053c56b8f8afffd7b2dac494b3cc2e71c4f6a
Component: engine
2015-10-21 08:28:37 -07:00
efb4544862 graph: ensure _tmp dir is always removed
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f6577be1c93150149c291f9d18375d7bcae9ebb1
Component: engine
2015-10-21 17:13:45 +02:00
58dd738ff1 daemon: faster image cache miss detection
Lookup the graph parent reference to detect a builder cache miss before
looping the whole graph image index to build a parent-children tree.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f9e81b40f4065e3d0851172759ef58fda6572cce
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148 graph: add parent img refcount for faster rmi
also fix a typo in pkg/truncindex package comment

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
f13bda05a2 integration-cli: docker_cli_build_test: check error before defer
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 04ef69a1e963e0c9bc9b685188f2c584ef275e45
Component: engine
2015-10-21 17:13:45 +02:00
6af2fef213 Using checkers assert for integration-cli/docker_cli_export_import_test.go
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
Upstream-commit: e72f92cb99b73469909dbb28fb5eedaadba9022b
Component: engine
2015-10-21 08:57:20 -04:00
9086b77304 Add support for multiple network in inspect
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.

`docker network inspect host bridge none` is possible now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
2015-10-21 08:57:29 +02:00
9bceeb4321 In NewV2Repository, check the suffix of endpoint.URL and append 'v2' correctly.
Signed-off-by: yuzou <zouyu7@huawei.com>
Upstream-commit: 5f59f52c1413087735852a038ee459833734d8a2
Component: engine
2015-10-21 11:43:31 +08:00
c3f438b95a Integration test for default bridge init with invalid cluster config
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 37627427a2ad9dcb06a2a6ea958670683a6c7934
Component: engine
2015-10-20 19:56:59 -07:00
82f86233a6 Vendoring in libnetwork to fix daemon bootup instabilities
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
46e5ffa9f8 cliconfig: Do not rely on platform dependent code
The 	`github.com/docker/docker/pkg/system` import was only being used to call to os.MkdirAll so it seems unnecessary to pull in all of system/* when this is all that is necessary.

Additionally, this was causing problems with attempting to vendor cliconfig using Godeps, as it would only vendor the necessary files based on the platform it's running on, this was seen when vendoring the package on a Mac, and then attempting to build on a Linux box due to `github.com/docker/docker/pkg/units/` not being properly included.

Signed-off-by: Chance Zibolski <chance@coreos.com>
Upstream-commit: 834f8b132b43b9075c08eb6186b888f7a224168f
Component: engine
2015-10-20 19:04:53 -07:00
5c5f223189 Merge pull request #17219 from endophage/gotuf_bugfixes
some bugfixes on getting tuf files
Upstream-commit: 967e49bdbc1949381cfa0a46493bf1ee8acd4759
Component: engine
2015-10-20 18:13:19 -07:00
a8c08d4980 Merge pull request #17202 from aboch/ipa
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
130257f149 Do not fail when a container is being removed and we request its delete again.
Abort the process and return a success response, letting the original
request finish its job.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c4e49d10143178c718178ff7ce857f4f8ed46a0b
Component: engine
2015-10-20 18:48:34 -04:00
834dc8ee1e Merge pull request #17177 from runcom/bc-fixes
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
72a0fc71b0 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c
Component: engine
2015-10-20 13:22:06 -07:00
d2c1aaefe0 Merge pull request #17149 from albers/completion-network-ipam
bash completion for new `docker network create` options
Upstream-commit: 3957368eff19170dd4d454b83cb593c8420b9d08
Component: engine
2015-10-20 15:54:05 -04:00
62ebe61ba1 Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option
Add zsh completion for 'docker network create -o --opt'
Upstream-commit: 081edfed3253ab315e1c0d2b60ffb72dcdc3a725
Component: engine
2015-10-20 15:48:12 -04:00
c19683280b Merge pull request #17188 from jfrazelle/fix-release-rpm
fix copy of multiple rpms
Upstream-commit: a7868191d43f4a0f73bf792973869f3df5dc8d37
Component: engine
2015-10-20 11:31:35 -07:00
988eb3b3bf Do not mask ipam driver if no ip config is passed
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
e65f97a6f3 Merge pull request #16917 from WeiZhang555/start-inte
use of checkers on `integration-cli/docker_cli_start_test.go`
Upstream-commit: b7fcc71a3c1d63be6f1133d02b29f6298c4f02ff
Component: engine
2015-10-20 19:51:15 +02:00
b0ff94f907 Merge pull request #16984 from estesp/update-busybox
Update Dockerfile to use the correct busybox:latest identifier
Upstream-commit: a2d1ec06e65f25f5e60ab550ac61ce46fb158505
Component: engine
2015-10-20 10:35:31 -07:00
fdccaa20d5 Merge pull request #17176 from rhvgoyal/fix-locking-issue
devmapper: Drop devices lock before returning from function
Upstream-commit: 7777c1be9bd5604014a0ac3f16e85960c4c0779a
Component: engine
2015-10-20 13:08:29 -04:00
7cf93e47cd validate the name of named volume
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: 609961ddcc835422e51ef4f3fd6088b96180f72f
Component: engine
2015-10-20 12:36:04 -04:00
ccde1983ec Update Dockerfile to use the correct busybox:latest identifier
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 414cfe946719a0ba811c95486d523e003d44fcc1
Component: engine
2015-10-20 12:03:11 -04:00
db6db88cda Merge pull request #17035 from estesp/fix-build-dir-perms
Correct build-time directory creation with user namespaced daemon
Upstream-commit: ad861876e8bb86091527f31fc944205743e5ce85
Component: engine
2015-10-20 08:57:19 -07:00
acccf55db2 use of checkers on Integration test
Part of #16756

Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 08944cdef7397752a686ea800e110a8fa14ce719
Component: engine
2015-10-20 23:07:33 +08:00
348b7977d8 Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
Use of checkers on docker_cli_info_test.go
Upstream-commit: aa8abf637ad1a2ccd44208ee0d59b24635c71555
Component: engine
2015-10-20 10:48:20 -04:00
47faea6d70 Merge pull request #17191 from mrjana/restart
Fix docker startup failure due to dangling endpoints
Upstream-commit: 566964bf73475e994ca605bd2106de045509d23f
Component: engine
2015-10-20 10:32:33 -04:00
aa912d7d1b Fix bug in volume driver test implementation
Also cleans up some of the driver handlers and converts this to use
checkers everywhere.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9f19cbc2c4cb6e031b12b04ea33447d427870c29
Component: engine
2015-10-20 09:17:49 -04:00
0c4bb86354 Merge pull request #17192 from HuKeping/docs-update
Docs: update docs for API stats
Upstream-commit: e92a735d7016ec79d0b0a91c0f003b2de2dabf9f
Component: engine
2015-10-20 06:15:58 -07:00
9aebf5450b Correct build-time directory creation with user namespaced daemon
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.

Add tests for the mkdir variants in pkg/idtools

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ae8c004dc18c59fec9cd67759a5e0087300e872d
Component: engine
2015-10-20 08:59:48 -04:00
009460477c Use of checkers on docker_cli_import_test.go.
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
Upstream-commit: 288214e5aecefd5477678e3dfb3f3fed0dcab23b
Component: engine
2015-10-20 19:58:16 +08:00
cd977f222f Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
use of checkers on docker_cli_start_volume_driver_unix_test.go
Upstream-commit: 89bfbb15162d3745cc871addcd74b2e5f464cfb9
Component: engine
2015-10-20 07:21:28 -04:00
f55f43d04c Using checkers assert for integration-cli/docker_cli_events_unix_test.go
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
Upstream-commit: bc478b453f630dc47e558096fb5545735de86d2e
Component: engine
2015-10-20 07:04:55 -04:00
57a4cfdd46 Docs: update docs for API stats
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 969f1d9773509940666a87f8342168bd2a8cf06d
Component: engine
2015-10-20 16:31:20 +08:00
08d2bcc589 Use of checkers on docker_cli_info_test.go.
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
Upstream-commit: 37b3cd421fcad5513f22a27983167895f4a6cc8d
Component: engine
2015-10-20 13:38:55 +08:00
e1c8600cf0 Fix docker startup failure due to dangling endpoints
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 8adfc7e2d2d158a08096f60ff9318db5bb0875bd
Component: engine
2015-10-19 21:29:35 -07:00
f3edec8c49 Vendoring libnetwork
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
57010d523d Merge pull request #16801 from aidanhs/aphs-add-socat-t
Update ambassador image, use the socat -t option
Upstream-commit: b826215c575e320f0cad7c07f8bfdf85437c1be9
Component: engine
2015-10-20 14:24:25 +10:00
e0385bf5ca Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes
MINOR documentation fix.
Upstream-commit: 310725c9331f6f294ab759698e707052efb7bf09
Component: engine
2015-10-19 18:36:42 -07:00