Commit Graph
27514 Commits
Author SHA1 Message Date
Justin Cormack 3fe1e84cec Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
2016-09-12 23:56:41 +01:00
Tõnis Tiigi 5363845025 Merge pull request #26499 from LK4D4/health_containerd
libcontainerd: use healthcheck to track containerd conn
Upstream-commit: 6a50b673eb1aed482700b38b131eff61449ed306
Component: engine
2016-09-12 15:52:48 -07:00
Alexander Morozov 9ad17e2570 Merge pull request #26461 from crosbymichael/term-exec
Add TERM env var to exec
Upstream-commit: 036a8f77b066c8c72e395fc78b08d34c934f9c21
Component: engine
2016-09-12 14:57:37 -07:00
Sebastiaan van Stijn 00b74c2b97 Merge pull request #26508 from docker/stevvooe-patch-1
issues: re-order issue template for more clarity
Upstream-commit: 056bd44f6bdf35f039681e729089a9c3957fe260
Component: engine
2016-09-12 23:43:55 +02:00
Stephen Day 28ced8e507 issues: re-order issue template for more clarity
Triaging issues has become a little challenging since the meat
of the information is below a large amount of unstructured
command line output. These changes add a description and move
the reproduction and expected/received results above the
unstructured output.

This should help for initial triaging, as well as self-triaging.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: be3bc483c684be2b5e84914695372aa1b5054ada
Component: engine
2016-09-12 14:34:00 -07:00
Alexander Morozov 99577ad8e2 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
Sebastiaan van Stijn eef9bfcd51 Merge pull request #26488 from vdemeester/26450-add-client-package-readme
Add a README to the client's package…
Upstream-commit: 6edf09cf5821aa947d9d52e21d72b065184fc421
Component: engine
2016-09-12 22:56:32 +02:00
Tonis Tiigi 57ee443d45 Fix already loaded detection for frozen images
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ed747e5a9e48c9e4b574895a5aab0e5daab670d1
Component: engine
2016-09-12 12:55:26 -07:00
Sebastiaan van Stijn 6b60b412a6 Merge pull request #26460 from icecrime/update_issue_triage
Update issue labels
Upstream-commit: 23d5b3be9b244aa3a175498a2a464e560a824603
Component: engine
2016-09-12 20:35:59 +02:00
Anusha Ragunathan fe55b3f380 Merge pull request #25794 from chenchun/timeout
Add default timeout to pkg/plugins/client
Upstream-commit: a4d1365bce140df239746b436b6e7c6d4cc54cc3
Component: engine
2016-09-12 11:27:36 -07:00
Charles Smith 33798c9855 removes sfsmithcha from maintainers
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 68d4000a0cf2feddc25ed34cb98ba2e403d7d1b2
Component: engine
2016-09-12 11:16:11 -07:00
Christy Perez 06d71bc71f Always check err before http status
A test failed expecting 200, but received -1, which is an err rc,
not an HTTP status code, so move these checks up.

Also log the output an not just check for a nil err.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 3dea5dbb9acb2699569c5aaf3737d58793152b3c
Component: engine
2016-09-12 12:45:08 -05:00
Riyaz Faizullabhoy 7d2bc2d40d Use latest version of notary server in trust sandbox docs
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 40f823ccd8ce0c07a27a287f665b4cc0c0084569
Component: engine
2016-09-12 09:42:12 -07:00
Michael Crosby ace1c458e2 Add TERM env var to exec
When the `-t` flag is passed on exec make sure to add the TERM env var
to mirror the expected configuration from run.

Fixes #9299

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4633f15f13d51530de2438c298a1084c55e4fedf
Component: engine
2016-09-12 09:20:27 -07:00
Denis Gladkikh 5099b8d2c1 Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 4907cc7793cf469fc2d6fc0f842d08bd045da569
Component: engine
2016-09-12 09:00:16 -07:00
Arnaud Porterie (icecrime) 1f6a545125 Update issue labels
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 19f0feadd6405176f7cbe94e0ad4b9dc1965da3e
Component: engine
2016-09-12 08:56:04 -07:00
Michael Holzheu 5f6c283538 s390x: Enable "make deb" for Ubuntu Xenial (16.04)
With this patch and Docker PR 25883 ("Add a Dockerfile for generating
manpages on s390x") "make deb" creates the following packages for s390x:

 # cd bundles/1.13.0-dev/build-deb/
 # find .
   .
   ./ubuntu-xenial
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.dsc
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.changes
   ./ubuntu-xenial/Dockerfile.build
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.tar.gz
   ./docker.log
   ./test.log

Package "docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb"
could be successfully installed on a s390x Ubuntu system:

 # cat /etc/issue
 Ubuntu 16.04.1 LTS \n \l
 # dpkg -i docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
 ...
 Installing new version of config file /etc/init.d/docker ...
 Installing new version of config file /etc/init/docker.conf ...
 Processing triggers for systemd (229-4ubuntu7) ...
 Processing triggers for ureadahead (0.100.0-19) ...
 Processing triggers for man-db (2.7.5-1) ...

 # docker version
 Client:
  Version:      1.13.0-dev
  API version:  1.25
  Go version:   go1.7
  Git commit:   2693af4-unsupported
  Built:        Wed Aug 24 11:41:13 2016
  OS/Arch:      linux/s390x

 Server:
 ...

The s390x "generate.sh" is a modified version of "ppc64le/generate.sh".
We removed seccomp for s390x because we need at least libseccomp version
2.3.1 which is not provided by Ubuntu Xenial.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 73df9b4e87d0a9fc13ef75e0d8f2f50ddfc8c7e5
Component: engine
2016-09-12 16:10:36 +02:00
Brian Goff 91d4a22ad9 Merge pull request #26103 from sakeven/fix-validate-build-arg
validate build-arg
Upstream-commit: e5544fbb0df01e679822352f49adc5c327ca6656
Component: engine
2016-09-12 09:15:58 -04:00
Antonio Murdaca 61ecf7906c Merge pull request #26456 from dnephin/move_cli_command_registry
Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: e8b9f38c7e2e249084c78c81f136c6d22432af6f
Component: engine
2016-09-12 15:11:04 +02:00
Brian Goff 23e3dc0dcd Merge pull request #26472 from yongtang/09112016-docker-build-step-0
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
2016-09-12 09:08:35 -04:00
Vincent Demeester 71716dd310 Merge pull request #26483 from miaoyq/optimized-debug-print-in-devicemapper
Optimized debug print in the 'deviceset.go'
Upstream-commit: ab2c9b373dbe0aee8441821a0e14bd66a58ba612
Component: engine
2016-09-12 15:08:12 +02:00
Brian Goff 0b4dde90a0 Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
Vincent Demeester 6c92d44315 Merge pull request #26481 from AkihiroSuda/nit-fix-convention-26467
[nit] test: fix trivial code convention noncompliance
Upstream-commit: e391e838048e499327476e24aab49e5a04645330
Component: engine
2016-09-12 15:03:29 +02:00
yuexiao-wang 4e9a7b27fc update option for docker commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
2016-09-12 19:10:45 +08:00
sakeven c169c364de validate build-arg
Signed-off-by: sakeven <jc5930@sina.cn>
Upstream-commit: 5426510bea290a8eff3842fdc32240ad33cc0ef1
Component: engine
2016-09-12 18:02:21 +08:00
Vincent Demeester be3b58071a Add a README to the client's package…
… taken from the old engine-api project.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a00106f9a5cf58cced011c93e98fbe1d7f65c4e7
Component: engine
2016-09-12 11:41:11 +02:00
yuexiao-wang 43008f4002 add option and update the description
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 1917d3b958da9ffc3b738941c783e9424e3c9c2e
Component: engine
2016-09-12 16:08:59 +08:00
Akihiro Suda 06f3b31b69 test: fix trivial code convention noncompliance
daemon/events/testutils: rename eventstestutils to testutils
volume/testutils: rename volumetestutils to testutils

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: e03cc68e3adb8aa584ed7db3cd70084fac0a2c4f
Component: engine
2016-09-12 07:36:52 +00:00
Yanqiang Miao 467aa61392 Optimized debug print in the 'deviceset.go'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 664ad19486b55a529ba2ba53b7d432b03dc5384a
Component: engine
2016-09-12 15:34:17 +08:00
Chun Chen 9a4ddab230 Add default timeout to pkg/plugins/client
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: 0699b00d26a60f4a8447572b34c4aad1ce73d2e1
Component: engine
2016-09-12 10:39:32 +08:00
Sven Dowideit ec2041215e Merge pull request #26306 from deployable/patch-1
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
2016-09-12 10:52:30 +10:00
Sven Dowideit 4472545a05 Merge pull request #26458 from sfsmithcha/fix_vip_diagram
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
2016-09-12 10:11:08 +10:00
Yong Tang 70a2fe1d7b Fix documentation for Step 0 to Step 1 in docker build
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
2016-09-11 10:52:40 -07:00
Madhu Venugopal 63c413223c Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
Vincent Demeester c47747e33c Merge pull request #26426 from sfsmithcha/carry_pry_25414
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
2016-09-10 11:50:28 +02:00
Vincent Demeester 7e3f0fe810 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
Matt Hoyle f9b7ffdb90 Keep headings consistant in API documentation
The "Stream details" sections are currently a part of the Status codes list.

This change moves them out to the same level as other surrounding sections.

Use () for a paramaters

Remove query param from end point heading

Signed-off-by: Matt Hoyle <matt@deployable.co>
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
2016-09-10 12:27:41 +10:00
Brian Goff c54b5bf8c4 Merge pull request #26457 from aboch/auto
Add fallback to resolveSystemAddr() in linux
Upstream-commit: ebae43efc2c1a13f0ff9b46ab568ba758e1a9b66
Component: engine
2016-09-09 20:46:29 -04:00
Charles Smith 0b9d5f508c carries and closes 25414
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
2016-09-09 15:57:53 -07:00
Charles Smith c4f625455b updates swarm overlay network diagram
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07:00
Alessandro Boch 52c85142d9 Add fallback to resolveSystemAddr() in linux
- So that swarm init will still work w/o specifying the advertise
  address when the daemon is running inside a container

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c0b24c600e30656144522f85b053f015525022da
Component: engine
2016-09-09 13:27:57 -07:00
Daniel Nephin be2034fe8c Remove remaining registry methods from DockerCLI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1dd46e06444d1a0c73fc88dfccec4ae0b7f10bf6
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin 4d7122f63b Remove cli/command/credentials
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e05fa5de480b7bf4c16df1624f85ecf96a42b3f7
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin bfc42c3a59 Remove RetrieveAuthConfigs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5d335fbda7d32f06c8b3080a79018b9585cb83f1
Component: engine
2016-09-09 15:50:01 -04:00
Stephen J Day b73e4afba2 tlsconfig: move Clone into proper package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9d7be9df8f79b26a4b9778851cf19a6579f8bc61
Component: engine
2016-09-09 12:05:17 -07:00
allencloud 69668dcc9a support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: af4461ad290d660acab5ef87b96e392263cc7cb9
Component: engine
2016-09-10 02:52:48 +08:00
John Howard e66566fbee Windows: Fix regression pulling linux images
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8437d0a3298abf8bf3632a2764b945956ece422f
Component: engine
2016-09-09 11:40:34 -07:00
Charles Smith 5ae8996c81 add swarm mode terms to the glossary
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
2016-09-09 11:18:30 -07:00
Phil Estes 32b3a84313 Merge pull request #22049 from boucher/docker-checkpoint-restore
Implement containerd API for checkpoints
Upstream-commit: cf58eb437c4229e876f2d952a228b603a074e584
Component: engine
2016-09-09 13:36:55 -04:00
Phil Estes c9069cbf6e Remove --read-only restriction when user ns enabled
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6062ae5742e49ec1a79073c327f3d1343c218a12
Component: engine
2016-09-09 13:23:41 -04:00