Commit Graph

27140 Commits

Author SHA1 Message Date
8a99df66fe Merge pull request #26432 from stevvooe/dont-hide-context-errors
client: don't hide context errors
Upstream-commit: 89bc5d54ca09573378616c4ee0000bb370d27aec
Component: engine
2016-09-09 08:53:43 -04:00
e8f53d8ee7 Merge pull request #26424 from michael-holzheu/PR-s390x-bump-to-binary-go-1-7-1
Dockerfile.s390x: Use binary go package
Upstream-commit: 7c118f40cb96f8eb112c89d2d517252dff791c5f
Component: engine
2016-09-09 09:53:02 +01:00
015d80b443 client: don't hide context errors
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 8e5ef8af5c90a3fbc93173cb485d42e044ca56ae
Component: engine
2016-09-08 17:47:43 -07:00
1d1f2eb8d2 Merge pull request #26422 from dnephin/move_api_client
Move api/client -> cli/command
Upstream-commit: e345d67c4e2862d497ec92640fd00bf04e6b696e
Component: engine
2016-09-08 16:44:49 -07:00
e2b900a8b1 Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
Propagate BUILD_APT_MIRROR and consume in buil-deb
Upstream-commit: da7a7f9b769f6c1ccc88526390a3ff6528e31eb9
Component: engine
2016-09-09 00:02:42 +01:00
623bb6a4a8 Fix a test that expects whitespace at the end of the line.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 485881b038eea7b1cee7f94f1e20e4cd3be85c0c
Component: engine
2016-09-08 15:50:14 -04:00
0238cc6815 Replace api/client imports with cli/command in experimental files.
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
2016-09-08 15:46:48 -04:00
d8acc366ce Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
2016-09-08 15:46:29 -04:00
5f9cd25fac Merge pull request #26406 from AkihiroSuda/fix-make-manpages
client: transport: fix tlsconfig Clone() on different Golang versions
Upstream-commit: 93e8aff1bc4a91e0cfdfd0974b4e68d43cc78006
Component: engine
2016-09-08 15:37:54 -04:00
0b990a4b09 Merge pull request #26107 from dnephin/client_cleanup
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
2016-09-08 12:18:46 -07:00
bbc0d92cc4 Merge pull request #26423 from AkihiroSuda/md2man106-1
update go-md2man to v1.0.6
Upstream-commit: 46d2256370221086e7ba9d1e85b2d56cb4aa7099
Component: engine
2016-09-08 11:38:29 -07:00
574f281ca0 Merge pull request #26224 from q384566678/test-zhou
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00
fbcd483854 Merge pull request #26119 from cpuguy83/lazily_load_fixtures
Move some test fixtures to go
Upstream-commit: 4e2d4429013ff4f6ca100063869b27b247f7da34
Component: engine
2016-09-08 11:16:27 -07:00
29c53b20fe client: transport: fix tlsconfig Clone() on different Golang versions
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 128cefc3bdfc458ac84ae6602d6484c79f479795
Component: engine
2016-09-08 17:55:54 +00:00
6ee28c633d Dockerfile.s390x: Use binary go package
We finally have a s390x binary tarball for go on "storage.googleapis.com".
So use this instead of bootstrapping with gccgo.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 47f13d3b84fb0ee867c6b6c2a213d78b471754bf
Component: engine
2016-09-08 19:52:43 +02:00
968f576e75 update go-md2man to v1.0.6
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 35ebc168e39cea35eda8d937f74a73d1a541065a
Component: engine
2016-09-08 17:25:56 +00:00
10deb56947 Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default
Fix Ulimits in `docker inspect` when daemon default exists
Upstream-commit: ba07661f0d6ae6b1b0d2e7271a8c8933bcc15364
Component: engine
2016-09-08 13:21:26 -04:00
3b1269cdeb Merge pull request #25523 from dmcgowan/fsync-layer-filestore
Update layer store to sync transaction files before committing
Upstream-commit: bc06542a1715273acc087dadd8179a88386dd6fb
Component: engine
2016-09-08 10:03:12 -07:00
45864fd48e Merge pull request #26397 from crosbymichael/rm-vendor-api
Remove unused engine-api packages
Upstream-commit: d579e24ad282b05e53bfb31313e4632e14f46652
Component: engine
2016-09-08 10:00:51 -07:00
14da2ebf2c Move holdHijackConnection to the container package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6af6a3a5383642d2d7c3784f0f4e562dc324819a
Component: engine
2016-09-08 12:58:06 -04:00
9fa1fb8eb9 Merge pull request #25962 from mrjana/net
Add support for docker run in swarm mode overlay
Upstream-commit: 719a640743604105d8eb029613c6d976163cea91
Component: engine
2016-09-08 09:39:00 -07:00
f861cad6dd Move container util methods to the container package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 31d8c27e704c9dd06ba3a0cccb7427054d9e6ccd
Component: engine
2016-09-08 12:38:52 -04:00
bb1ed52ac8 Extract input stream into a new type.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bec81075bf1ae07abcbf3f984922dedb10458cb2
Component: engine
2016-09-08 12:34:55 -04:00
e0295afbc4 Extract stream output handling to a new type.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0ab33124a52853af611254cd73838e3d4407f51
Component: engine
2016-09-08 12:33:41 -04:00
0bb5674bf4 Merge pull request #26205 from allencloud/fix-warnings-append
add warnings when verifying container settings
Upstream-commit: b1dfefc4bb76c48a75f07d8c478b16863266bced
Component: engine
2016-09-08 12:10:37 -04:00
77b48e7428 Merge pull request #26252 from leslau/master
Fixed custom daemon options on systemd docs still using -H fd://
Upstream-commit: 7baa09faa02ad93dcb0e103abde3c45862fc903c
Component: engine
2016-09-08 17:15:13 +02:00
5c0c4a4b23 Merge pull request #25578 from rwilliams/conemu
Force input stream ANSI emulation for ConEmu.
Upstream-commit: 28d18b8205c813e18af96f0eb88850b2734077f4
Component: engine
2016-09-08 11:12:33 -04:00
774225b30e Merge pull request #26228 from lixiaobing10051267/masterPluginRm
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
2016-09-08 11:09:18 -04:00
cc5c9f50ef Merge pull request #25777 from swernli/servicing_race
Fixing race in Windows container servicing
Upstream-commit: 4219c0018f129bf50d1c7f8b7ab05c2659d88dfa
Component: engine
2016-09-08 10:42:15 -04:00
955f123fe8 Fix ulimits in docker inspect when daemon default exists
This fix tries to fix 26326 where `docker inspect` will not show
ulimit even when daemon default ulimit has been set.

This fix merge the HostConfig's ulimit with daemon default in
`docker inspect`, so that when daemon is started with `default-ulimit`
and HostConfig's ulimit is not set, `docker inspect` will output
the daemon default.

An integration test has been added to cover the changes.

This fix fixes 26326.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7d705a7355d650feffc966e08efc0f92297145a8
Component: engine
2016-09-07 23:15:22 -07:00
f0d30a4b26 Add support for docker run in swarm mode overlay
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99a98ccc14a9427be47c8006e130750710db0a16
Component: engine
2016-09-07 21:20:41 -07:00
33561ab95c Merge pull request #24586 from farcaller/gcplogs
Added optional flags to init gcp logger metadata
Upstream-commit: 5be6ccc433e8c9207c67087304dfb72fa00ba544
Component: engine
2016-09-08 13:47:48 +10:00
8bc9e6240b Merge pull request #25891 from Microsoft/jjh/processlist
Windows: Docker top implementation
Upstream-commit: 48c615f853161f2630ab1df039b6f1169de7c129
Component: engine
2016-09-07 20:58:20 -04:00
87e9af6d92 Merge pull request #26395 from unclejack/bump_go_to_1.7.1
Dockerfile*: bump Go to 1.7.1
Upstream-commit: e482d8472b7212f8e9fe13c33f12e8206393dcb5
Component: engine
2016-09-07 17:17:38 -07:00
057c226c2d Merge pull request #25806 from Microsoft/jjh-missingdigest
Don't fail daemon start on missing layer
Upstream-commit: b890d475f7ad128c70cfa49274d1a4cd3fe1109f
Component: engine
2016-09-07 16:35:27 -07:00
29459f6822 Windows: docker top implementation
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f0474851298e7ba70b1a7ea16e3421d5926c98
Component: engine
2016-09-07 16:29:02 -07:00
4f702dbddb Remove unused engine-api packages
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c612147a532921f68bb7a8476d51a6f312e0dfab
Component: engine
2016-09-07 15:55:13 -07:00
690d211fb6 Vendor libnetwork @00e7660daeb4
- Fixes #25325
  - Fixes certain issues with workers leaving swarm and rejoining
  - Adds cluster provider interface methods to support docker run on
    overlay in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99c39680984018b345881a29d77a89f87958a57b
Component: engine
2016-09-07 15:11:48 -07:00
a75b486d92 Dockerfile*: bump Go to 1.7.1
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 1668894d0400f1b6446ce0db2d92ad14ea97014d
Component: engine
2016-09-08 00:42:35 +03:00
cecd3ec1b9 Move some test fixtures to go
moves ensure-frozen-images to go
moves ensure-syscall-test to go
moves ensure-nnp-test to go
moves ensure-httpserver to go

Also makes some of the fixtures load only for the required tests.
This makes sure that fixtures that won't be needed for a test run such as
`make TESTFLAGS='-check.f Swarm' test-integration-cli` (for example)
aren't loaded... like the syscall tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ff91276d1f5beab5582d9ca582ee01af13198333
Component: engine
2016-09-07 17:30:35 -04:00
6aa1b8a3eb Merge pull request #26378 from rhvgoyal/fix-max-retries
devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced
Upstream-commit: ce5eb34e68ec84505ede64efa9cfc9b8d177f086
Component: engine
2016-09-07 16:56:45 -04:00
7549abdea0 Windows: Skip layers+base images
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 540c8e9b201cfcf46cf9d2c05d42c492edda4117
Component: engine
2016-09-07 12:16:45 -07:00
97719e4178 Vendor swarmkit @27fbaef4ceed6
Adds a new task runtime to support network attachmemt for plain old
docker containers so that they can participate multi-host networks and
get access to services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 39143ef15d6b95acc37f209c8ba5ebc4b3d57c79
Component: engine
2016-09-07 11:52:49 -07:00
2280ed4544 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
Rewrites to Understanding Docker topic for clarity
Upstream-commit: 426a0af0759798d8e3332b38236ee40df6d14798
Component: engine
2016-09-07 11:36:58 -07:00
696033b6f3 Merge pull request #26349 from crosbymichael/api-to-docker
Move engine-api to docker
Upstream-commit: 3ea762b9f6ba256cf51bd2c35988f0c48bccf0b0
Component: engine
2016-09-07 11:08:11 -07:00
60a22c207c Move engine-api client package
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7c36a1af031b510cd990cf488ee5998a3efb450f
Component: engine
2016-09-07 11:05:58 -07:00
45ddc4bfcb Add engine-api types to docker
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
2016-09-07 11:05:58 -07:00
30755d9f2c devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced
We just introduced a new tunable dm.xfs_nospace_max_retries. But this tunable
will work only on new kernels where xfs supports this feature. On older
kernels xfs does not allow tuning this behavior.

There are two issues. First one is that if xfsSetNospaceRetries() fails,
it returns error but leaves the device activated and mounted. We should
be unmounting the device and deactivate it before returning.
 
Second issue is, if docker is started on older kernel, with
dm.xfs_nospace_max_retries specified, then docker will silently ignore the
fact that /sys file to tweak this behavior is not present and will continue.
But I think it might be better to fail container creation/start if kernel
does not support this feature.

This patch fixes it. After this patch, user will get an error like following
when container is run.

# docker run -ti fedora bash
docker: Error response from daemon: devmapper: user specified daemon option dm.xfs_nospace_max_retries but it does not seem to be supported on this system :open /sys/fs/xfs/dm-5/error/metadata/ENOSPC/max_retries: no such file or directory.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 6cc55dd65b363fe520c2ab29a9303f79afd4cadb
Component: engine
2016-09-07 14:03:01 -04:00
5133a883a8 Rewrites to Understanding Docker topic for clarity
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 12b740b65c88f6225241fe9a73575ec083ddba5d
Component: engine
2016-09-07 11:02:03 -07:00
a1f4f932da Merge pull request #26342 from cpuguy83/20079_restore_volume_migrate
restore migrating pre-1.7.0 volumes
Upstream-commit: a6daa94e3e0c1a60ba054eddc819c77a5dcc78b9
Component: engine
2016-09-07 10:56:07 -07:00