31e2336b4e
Merge pull request #32883 from albers/completion-history--format
...
Add bash completion for `history --format`
Upstream-commit: 2881e2be587e5a16e3f1f5e9d5547263517c9c54
Component: engine
2017-04-27 10:51:12 -07:00
ce59d98dee
Merge pull request #32858 from dnephin/builder-shell-words-interface
...
[Builder] Remove b.escapeToken, create ShellLex
Upstream-commit: aee2da3bdf6665939722dacf3b0c149499c35d90
Component: engine
2017-04-27 13:16:40 -04:00
0fd96c2554
Merge pull request #32717 from fcrisciani/data_path
...
Data path traffic separation option in swarm mode
Upstream-commit: 0307fe1a0bcdc02583a24add41eb783c117bad8c
Component: engine
2017-04-27 13:00:55 -04:00
3b753edcdd
Merge pull request #31984 from tonistiigi/remote-context
...
builder: Refactor remote context
Upstream-commit: ae0f8c7ba16362e869894e0121cf3052069d7fe4
Component: engine
2017-04-27 11:50:18 -04:00
956e1394b5
Add bash completion for history --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c3e161fb52835823e6d00c5a4d94323cb0a09964
Component: engine
2017-04-27 10:18:55 +02:00
182eb7ea78
Merge pull request #32802 from juliengk/docs_plugin_authz
...
Update legacy_plugins.md to include HBM authz plugin
Upstream-commit: d90fb13de717effaff70ffc466f913eb9b453e30
Component: engine
2017-04-26 23:09:47 -04:00
e7900cc574
Merge pull request #31557 from ripcurld0/add_stack_ls
...
Add the format option to the docker stack ls command
Upstream-commit: 6559abaf477352dc03725a70c85d0ea9c8d5974e
Component: engine
2017-04-26 19:13:33 -07:00
1f57e06852
Merge pull request #32870 from thaJeztah/anusha-no-auto-assign
...
Disable auto-assign for Anusha
Upstream-commit: 5704d58cd89900555763bc3e55bff9cff50a481e
Component: engine
2017-04-26 18:55:01 -07:00
99fff90178
Merge pull request #32834 from Microsoft/gowinio-v0.3.9
...
Remove go-winio fork - move to v0.3.9
Upstream-commit: 3c5f3fd42bfb449ca56df03250096b3bd1bd22de
Component: engine
2017-04-26 21:06:39 -04:00
8fc8babfdf
Merge pull request #32564 from dnephin/compose-file-rel-dir
...
Set Composefile WorkingDir to dirname of the composefile.
Upstream-commit: 22d9eadee2f511c5d39c0458116738e05d5d1e98
Component: engine
2017-04-26 17:30:33 -07:00
eed7e3e562
Disable auto-assign for Anusha
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 97d6b2a873ac62fec61117201325294679241205
Component: engine
2017-04-26 17:18:06 -07:00
e25a81277d
Create a new ShellLex struct which provides the expected interface to Builder.
...
Remove b.escapeToken from builder
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2414166e1e38a4de8aa4af40b90c7e1bc90102b0
Component: engine
2017-04-26 19:39:16 -04:00
0411944839
Merge pull request #31856 from jim-minter/more_races
...
Resolve a set of race conditions in logging and attaching code
Upstream-commit: 5eca7f7c5d7678f6548cd7d90199d67ce98d4c98
Component: engine
2017-04-26 16:04:02 -07:00
17438d5f4c
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: 8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8
Component: engine
2017-04-26 15:33:15 -07:00
648a386996
Libnetwork vendoring
...
Vendor libnetwork changes for --data-path-addr flag
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: b96988feb928d295569f82fd0eaed5c16efad41d
Component: engine
2017-04-26 15:33:13 -07:00
d6b5919889
Merge pull request #32574 from mlaventure/add-ctx-to-df-prune
...
Add ctx to df and prune
Upstream-commit: d4bf6ad71623012a53e45debc90aaab0876ece48
Component: engine
2017-04-26 15:42:08 -05:00
5f291cb6ec
Use personal email address
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 54dfc3721ca9f5e5e8e8178b0aae3f44a6a4575a
Component: engine
2017-04-26 11:59:51 -07:00
d617eb3d7d
Merge pull request #32831 from jmaitrehenry/patch-2
...
Clarify where the RUN command runs from
Upstream-commit: 94465adaf05edd16f518f255cd7ad3c5ca23e2ac
Component: engine
2017-04-26 11:34:00 -07:00
c057b8b3f4
Clarify where the RUN command runs from
...
Also, chained/quoted shell does not work
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com >
Upstream-commit: 3f6e861c14bf13bb5b43aacb9edfbb027d6b6903
Component: engine
2017-04-26 13:54:48 -04:00
59446e4411
Merge pull request #32824 from aaronlehmann/raftquorum-test-bug
...
Fix incorrect assumption in TestAPISwarmRaftQuorum
Upstream-commit: 4480e0417eb01caf29ae285880ec51a0180faf7f
Component: engine
2017-04-26 15:14:50 +02:00
d806eb521a
Merge pull request #32829 from aaronlehmann/cli-image-tests-corrections
...
cli: Correct command/image tests for testify
Upstream-commit: 08422650bec3c38936cc3eb950cc87c2d4ad9233
Component: engine
2017-04-26 11:29:11 +02:00
580f2ecac8
Merge pull request #32540 from cpuguy83/add_logdrivers_to_info
...
Add logdrivers to /info
Upstream-commit: e8abe0a69d0d6838412a63d7170b9b92877ec3a2
Component: engine
2017-04-25 23:25:30 -05:00
b5df2ac4ee
Merge pull request #32817 from vdemeester/fix-win-it
...
Fix docker run -it on windows
Upstream-commit: d4fb626e3694ac7b2f5f4870a9a8068d02585958
Component: engine
2017-04-25 20:10:38 -07:00
2743d73954
Remove go-winio fork - move to v0.3.9
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7a3aa2dabe5000becbacaf87971ba9186cbf797c
Component: engine
2017-04-25 20:00:47 -07:00
c3e28b780f
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: acc2d5b7d6817dd8b256e4d7f3a5ca1f207e327f
Component: engine
2017-04-25 16:24:07 -07:00
aadacb3d07
Refactor remote context parsing
...
Redefine a better interface for remote context dependency.
Separate Dockerfile build instruction from remote context.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d1faf3df27207af111daf4bd0191478c374dbc55
Component: engine
2017-04-25 14:35:31 -07:00
74bc2c5808
move service runtime filter to server
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: bb30ab9b5f8ebbe412148ae380e69af6e3503d34
Component: engine
2017-04-25 15:38:46 -04:00
e245f3021a
Fix incorrect assumption in TestAPISwarmRaftQuorum
...
This test shuts down two out of three managers and then asserts that the
swarm has a leader. A swarm that lost quorum won't necessarily have a
leader, and in this case only has one because the old leader is still
around. Soon SwarmKit will be changed so the leader gives up leadership
when quorum is lost. This will avoid confusing situations, like
read-only APIs succeeding, while ones that write to Raft hang.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c27603238c5493909ec9b657b342b67b23e615e3
Component: engine
2017-04-25 12:10:12 -07:00
6d16df6b88
Fix docker run -it on windows
...
Signed-off-by: Vincent Demeester <vincent@demeester.fr >
Upstream-commit: 8c014db3027b1ddecd42389e24b9c46d5f7a93ae
Component: engine
2017-04-25 18:25:05 +02:00
76d9eb02b7
Add format to docker stack ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 205ec49de9c4f4abb8023d1ad36fdbc92e7ec294
Component: engine
2017-04-25 16:45:30 +03:00
7ee17f3128
Merge pull request #32470 from runcom/remove-init-client
...
remove --init-path from client
Upstream-commit: e1101b1295f05ef3c6f1a684a51cd508b3c7874c
Component: engine
2017-04-25 10:25:58 +02:00
1a70cac422
Merge pull request #32341 from ripcurld0/tt_rm_ut
...
Use a test table in the daemon delete unit tests
Upstream-commit: a3a109d9569ffb8896bc27d9b8fc6ac946071b94
Component: engine
2017-04-25 10:25:05 +02:00
b88d6f72e1
Merge pull request #32600 from dnephin/refactor-builder-dispatch-state
...
Refactor builder dispatch state
Upstream-commit: cf6dc6160a873487f2b5b8b404da7b9f61f00b77
Component: engine
2017-04-25 09:32:23 +02:00
84b16a2f43
Update legacy_plugins.md to include HBM authz plugin
...
Signed-off-by: Julien Kassar <github@kassisol.com >
Upstream-commit: 47367b21d5892c16dd69e6728574b91c72cc528b
Component: engine
2017-04-24 19:46:57 -04:00
f0510caf2e
image/spec: tags are 128 characters
...
Mostly, they always have been. Most regular expressions were implemented
as `[\w][\w.-]{0,127]`, which actually allows 128 characters, since we
start with a character in the first expression.
This "fact" has been backported to the existing specifications where
length is mentioned. For the most part, no ill-effects should come of
this, unless someone has optimized to hold the length of a tag in a 7
bit integer.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: c9beb417f46a3a0d06a89c67b134cd399a7b948b
Component: engine
2017-04-24 15:23:34 -07:00
6c0f9bd02c
Reduce the number of calls to b.image
...
In preparation for removing it from builder.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 52626bb9199ca3562fa70f14d8fc7b8c12c8b0f5
Component: engine
2017-04-24 14:21:19 -04:00
7e9b6e3ca4
Change builder.dispatchers to use a dispatchRequest object
...
This change starts the process of splitting up the Builder into logical
components. Remove builder.flags and move it to the new dispatchRequest
object.
Use runConfig from dispatchRequest instead of from the builder.
More progress removing things from the Builder struct.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e59327aaac338bd350746e0e6479489f21a0a1fa
Component: engine
2017-04-24 14:21:19 -04:00
57d7fd25ff
Merge pull request #32500 from dnephin/refactor-from-dispatcher
...
Refactor from dispatcher
Upstream-commit: 3beb8d9c8bc77762abceea52a742c1221636ea44
Component: engine
2017-04-24 10:10:42 -07:00
1129db854a
Prevent multiple identical parallel pruning operations
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 3279ca3c009be8d4746df483ea45203ff0c701d8
Component: engine
2017-04-24 09:13:05 -07:00
50fe474af4
Honor context cancellation when pruning
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0dee69799eb467543dc2ae4cc3bb7b46bc7e21d4
Component: engine
2017-04-24 09:11:29 -07:00
b344c38939
Prevent multiple parallel SystemDiskUsage call
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 5a9f2a3ce66d8b0954af965b0b8bf384df02c41a
Component: engine
2017-04-24 09:11:29 -07:00
31ab70fb42
Honor context within SystemDiskUsage
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: cf7d246ab0d848cbc673f7c2d57031aecacacdfe
Component: engine
2017-04-24 09:11:29 -07:00
4c686214d7
Merge pull request #32685 from albers/completion-cleanup-1
...
Remove bogus statement from bash completion
Upstream-commit: 8cb9d7ec2e56ca360da55d66bc77e799faca1dd0
Component: engine
2017-04-24 11:02:39 -05:00
fa19ecf48f
Merge pull request #32608 from darrenstahlmsft/WindowsNanoCPUs
...
Windows: Fix scaling of NanoCPUs (--cpus) on Hyper-V containers
Upstream-commit: d0ce488d9d420ebc7a448a51a58e4aa14041da7e
Component: engine
2017-04-24 10:54:14 -05:00
be541248e1
Merge pull request #31912 from AkihiroSuda/ovl-on-non-swarm
...
improve error of `docker network create -d overlay` on non-Swarm node
Upstream-commit: f9311c52cee8ddc13e69862b2f060013eeb82aba
Component: engine
2017-04-24 17:20:48 +02:00
0f75777a54
Merge pull request #32248 from icapurro/cli-image-tests
...
Unit tests for cli/command/image package
Upstream-commit: 663f0ba1b2a90dc56e4e03777754dccd3092c7f1
Component: engine
2017-04-24 17:01:26 +02:00
ae1cfbfd19
Merge pull request #32731 from hairyhenderson/one-line-swarm-join-output-32725
...
Output `docker swarm join` command on a single line when running `docker swarm init`
Upstream-commit: c22b21fede388f0072a5a01b9177bfafefe269cb
Component: engine
2017-04-24 09:53:16 -05:00
0b4ffdab67
Unit tests for cli/commands/image (except build and tag)
...
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com >
Upstream-commit: b2551c619d30f163c3ab8c9ee53cdb09bfbeaa55
Component: engine
2017-04-23 12:27:39 -05:00
60d521eac2
Merge pull request #32768 from dnephin/try-enable-test-matches-on-windows
...
Enable TestMatches on windows
Upstream-commit: c264aefdac2d0698df62d203455fcee83e9fd7ee
Component: engine
2017-04-23 15:54:45 +02:00
87a3307749
Merge pull request #32740 from vdemeester/integration-trusted-cmd-cli
...
Use `cli` for trusted related command
Upstream-commit: 83ee902ecc3790c33c1e2d87334074436056bb49
Component: engine
2017-04-22 14:51:12 -07:00
