Commit Graph
36672 Commits
Author SHA1 Message Date
Vincent Demeester cd011dde74 Merge pull request #33035 from YuPengZTE/devCheckpointList
check err
Upstream-commit: 5f0ea4d0164ca722777a74d82174f81925b5c2a2
Component: engine
2017-05-05 14:24:48 +02:00
Brian Goff fb69291f3e Merge pull request #31104 from cpuguy83/dm_lvmsetup
Add option to auto-configure blkdev for devmapper
Upstream-commit: 05ad14fc1bc5626895a419a991fcf8932eb91d27
Component: engine
2017-05-05 07:35:24 -04:00
yupengzte 806df9b043 check err and add print
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 130d1491b7d813937d30169829d95ad58e0b54a6
Component: engine
2017-05-05 14:50:00 +08:00
yupengzte a7c561e6df check err
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 0d99cb862997d9421d5c5c4dc96983067ddc4d84
Component: engine
2017-05-05 13:33:40 +08:00
Sebastiaan van Stijn bd96b9098d Merge pull request #32951 from wsong/patch-2
Add a proper type to the Source field in Mount
Upstream-commit: 118d4ee1230119c1e0be4b9946593916d85ca386
Component: engine
2017-05-04 17:09:25 -07:00
Tonis Tiigi b61f5e2e48 Allow checking out any ref in gitutils
Also changes so that shallow fetch is performed
even when a specific ref is specified.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 493a6c3d41bbe4f5741c27cf8af2e88af65485d2
Component: engine
2017-05-04 14:14:50 -07:00
Daniel Nephin 965d054208 Some refactoring of dispatch()
Remove runConfig from Builder and dispatchRequest. It is not only on
dispatchState.

Move dispatch state fields from Builder to dispatchState

Move stageName tracking to dispatchRequest.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2f0ebba0e7f43908a41d5ff9bbb1b9b78743a6ab
Component: engine
2017-05-04 17:11:08 -04:00
Tibor Vass 5e5e88ff06 Merge pull request #33019 from tianon/docker-crossplatforms
Only set DOCKER_CROSSPLATFORMS from env if it's set
Upstream-commit: a74833aa70539ce0a2627e24ec9d78945348ad05
Component: engine
2017-05-04 12:22:32 -07:00
Drew Erny 06646a47aa Fix an issue with service logs hanging
Fixed an issue where service logs would hang if the container backing a
task was deleted by not waiting for containers to be ready if we're not
following logs.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 80c3ec027d9fd4f7ea2080adc08fc741f8909b2e
Component: engine
2017-05-04 12:13:14 -07:00
Tõnis Tiigi 5de8341dce Merge pull request #32727 from darrenstahlmsft/WindowsSmallNanoCPUs
Prevent a non-zero NanoCPUs from setting a zero CPU.Count
Upstream-commit: 2f3f1e6ccd609080b209ab876210491689d77201
Component: engine
2017-05-04 09:37:55 -07:00
Tianon Gravi 0bdeddc5c2 Only set DOCKER_CROSSPLATFORMS from env if it's set
This allows for the default to come from the image/`Dockerfile` rather
than being unconditionally overwritten by the environment.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9c9cc5ec431b2dd69362dbe712adef3314b674fe
Component: engine
2017-05-04 07:13:09 -07:00
Brian Goff 2bc165a865 Merge pull request #32944 from cpuguy83/add_no_new_privs_flag
Add no-new-privileg flag
Upstream-commit: 140fefd581e6ec3cc1e2d434c2f484d2d386331c
Component: engine
2017-05-04 09:23:01 -04:00
Brian Goff ed9c3799a0 Merge pull request #32946 from cpuguy83/add_logdrivers_to_info_api_doc
Add swagger spec for /info Log plugins
Upstream-commit: 865a5fd5e3baec65dd221610d2817cddd75eeb4b
Component: engine
2017-05-04 09:20:51 -04:00
Tibor Vass 147da8e072 update vendor.conf
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b141fa3799
Component: cli
2017-05-03 19:27:10 -07:00
Tibor Vass 9ce2cd0d41 Fix expected output in test due to linter-induced change on error string
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 03a36f9d50
Component: cli
2017-05-03 19:26:45 -07:00
Tibor Vass 1b83577108 Update cli folder with newer changes from moby/moby
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ae84e6dd5e
Component: cli
2017-05-03 19:25:17 -07:00
Daniel Nephin f28f6fde81 Refacator pkg/streamformatter
StreamFormatter suffered was two distinct structs mixed into a single struct
without any overlap.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 779012af69
Component: cli
2017-05-03 18:49:14 -07:00
yupengzte 065585bc3c delete ineffectual assignment
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 9ca78094b5
Component: cli
2017-05-03 18:49:14 -07:00
Flavio Crisciani 056c564996 Inroduce SWARM --data-path-addr flag
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)

Negative test added for invalid flag arguments

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 169160ba63
Component: cli
2017-05-03 18:45:48 -07:00
Ying Li 8f4c7f862a Add the CACert parameter to the ExternalCA object in order to match
swarmkit's API type.  Make sure this parameter gets propagated to
swarmkit, and also add an extra option to the CLI when providing
external CAs to parse the CA cert from a file.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 81f87595fe
Component: cli
2017-05-03 18:45:48 -07:00
Evan Hazlett dae2aee5bb remove service runtime filter in stack command
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 6665c9c747
Component: cli
2017-05-03 18:45:48 -07:00
Aaron Lehmann 9903b4cd8e cli: Correct command/image tests for testify
These tests were caught in the crossfire of the transition to testify.
testify has a few subtle differences from the similar custom framework
it replaced:

- Error behaves differently
- Equal takes its arguments in a different order

This PR also takes the opportunity to use a few shorthands from testify,
such as Len, True, and False.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6f94ab98f5
Component: cli
2017-05-03 18:45:48 -07:00
Evan Hazlett 461a743521 move service runtime filter to server
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 25809f8991
Component: cli
2017-05-03 18:44:11 -07:00
Vincent Demeester fe666a9eff Fix docker run -it on windows
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
Upstream-commit: c67589a52c
Component: cli
2017-05-03 18:41:19 -07:00
Boaz Shuster 772ad3f5fe Add format to docker stack ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5b6bd92862
Component: cli
2017-05-03 18:41:19 -07:00
Ignacio Capurro 8339598b82 Unit tests for cli/commands/image (except build and tag)
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
Upstream-commit: e7793092a2
Component: cli
2017-05-03 18:40:22 -07:00
Sebastiaan van Stijn 9388ca1f3a Merge pull request #33003 from philippgille/patch-1
Fix list of experimental features
Upstream-commit: a0fe5e9ca005273d76f6d0b66fabe1836095e2ce
Component: engine
2017-05-03 18:35:55 -07:00
Dave Henderson 02642ac6f8 Output docker swarm join on a single line
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.

Fixes #32725

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: 2b31a4bf8d
Component: cli
2017-05-03 17:46:41 -07:00
Daniel Nephin 09a02ca02d Set Composefile WorkingDir to dirname of the composefile.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a1b7969bce
Component: cli
2017-05-03 17:46:40 -07:00
Colin Hebert 82e97b94dd Regenerate schema with the correct libraries
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 9c02b38bec
Component: cli
2017-05-03 17:46:40 -07:00
Colin Hebert 979faf3831 Run go generate github.com/docker/docker/cli/compose/schema
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 53b43f02e2
Component: cli
2017-05-03 17:46:40 -07:00
Colin Hebert fed1be2dd6 Add support for labels during build with compose
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: a2c8291e1e
Component: cli
2017-05-03 17:46:40 -07:00
Dong Chen 752e3db428 do not allow duration less than 1 ms in healthcheck parameters
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: a316b380e7
Component: cli
2017-05-03 17:46:40 -07:00
Brian Goff 0f7b433a23 Add logdrivers to /info
This is required for swarmkit to be able to filter based on log driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c44e74e676
Component: cli
2017-05-03 17:46:39 -07:00
Antonio Murdaca 7a4be5671b remove --init-path from client
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dea809813e
Component: cli
2017-05-03 17:46:39 -07:00
Gaetan bdb1bed9c8 Merge pull request #24 from gdevillele/pr-add-build-status-badge
add CI build status badge to README
Upstream-commit: 1c0847b912
Component: cli
2017-05-03 14:32:46 -07:00
Philipp Gillé 9be599cec9 Fix list of experimental features
- Remove duplicate entry
- Fix anchor in link

Signed-off-by: Philipp Gille <philipp.gille@gmail.com>
Upstream-commit: 5657f05b5abfb3c8efd28008b41383346714ed0a
Component: engine
2017-05-03 23:29:11 +02:00
Sebastiaan van Stijn 247fa65d00 Merge pull request #32965 from ijc25/setarch-2.6
seccomp: Allow personality with UNAME26 bit set.
Upstream-commit: bf5cf84534f1eac9805c6f1bffff341358806b57
Component: engine
2017-05-03 13:44:21 -07:00
Gaetan de Villele d186189ce5 add ci build status badge to readme
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 92094372d3
Component: cli
2017-05-03 13:28:06 -07:00
Vincent Demeester 7b15b0b584 Merge pull request #23 from dnephin/fix-goimports-on-master
Fix goimports failure on master
Upstream-commit: b7d3dd4d41
Component: cli
2017-05-03 22:27:16 +02:00
Daniel Nephin 9afb137b84 Merge pull request #19 from dnephin/check-vendor
Check vendor
Upstream-commit: 328fa4b717
Component: cli
2017-05-03 16:01:56 -04:00
Daniel Nephin d51e95efed Fix goimports failure on master.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 36a7842089
Component: cli
2017-05-03 15:58:39 -04:00
Daniel Nephin 5f4fc55626 Merge pull request #13 from dnephin/cleanup-post-docker-stin
Small build client cleanup handling dockerfile from stdin
Upstream-commit: c202b4b987
Component: cli
2017-05-03 15:45:41 -04:00
Daniel Nephin 3ca812826a Merge pull request #9 from gdevillele/pr-update-makefile
update Makefile
Upstream-commit: 589afd2f50
Component: cli
2017-05-03 15:43:26 -04:00
Vincent Demeester d2eb631302 Merge pull request #32876 from YuPengZTE/devIneffectualAssignment
delete ineffectual assignment
Upstream-commit: fa4b377bbc4329a5716630c98f50790048058c6c
Component: engine
2017-05-03 20:55:57 +02:00
Vincent Demeester df3bda7143 Merge pull request #20 from dnephin/more-lint
Add more lint checks
Upstream-commit: 9e413798bf
Component: cli
2017-05-03 20:53:30 +02:00
Gaetan de Villele dfb4d9262a define targets as “phony”, add comments, and mount docker.sock in dev target
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 7f7e842702
Component: cli
2017-05-03 11:14:06 -07:00
Daniel Nephin 9494cbba92 Merge pull request #32749 from dnephin/rm-ContainerUpdateCmdOnBuild
[Builder] Remove ContainerUpdateCmdOnBuild
Upstream-commit: 37be26382614d833e4855b4fc1eb89a6817d8426
Component: engine
2017-05-03 14:02:08 -04:00
Brian Goff 24557ed762 Add option to auto-configure blkdev for devmapper
Instead of forcing users to manually configure a block device to use
with devmapper, this gives the user the option to let the devmapper
driver configure a device for them.

Adds several new options to the devmapper storage-opts:

- dm.directlvm_device="" - path to the block device to configure for
  direct-lvm
- dm.thinp_percent=95 - sets the percentage of space to use for
  storage from the passed in block device
- dm.thinp_metapercent=1 - sets the percentage of space to for metadata
  storage from the passed in block device
- dm.thinp_autoextend_threshold=80 - sets the threshold for when `lvm`
  should automatically extend the thin pool as a percentage of the total
  storage space
- dm.thinp_autoextend_percent=20 - sets the percentage to increase the
  thin pool by when an autoextend is triggered.

Defaults are taken from
[here](https://docs.docker.com/engine/userguide/storagedriver/device-mapper-driver/#/configure-direct-lvm-mode-for-production)

The only option that is required is `dm.directlvm_device` for docker to
set everything up.

Changes to these settings are not currently supported and will error
out.
Future work could support allowing changes to these values.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ef07d79c4712d5b1ff4f0c896932ea8902a129c
Component: engine
2017-05-03 13:49:15 -04:00
Wentao Zhang 2849edb0ec fix when rpc reports "transport is closing" error, health check go routine will exit
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
Upstream-commit: 60742f9a95cb5eff549a873a53724863f1ab20e2
Component: engine
2017-05-04 00:52:10 +08:00