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
f87af544c7
Merge pull request #32813 from ehazlett/fix-service-ls-filter
...
Move service runtime filter to server
Upstream-commit: f3ff8dc584b27bac115ed2fa023a986934798423
Component: engine
2017-04-25 16:38:59 -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
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
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
cad49a8597
Merge pull request #32798 from stevvooe/tags-are-128-characters
...
image/spec: tags are 128 characters
Upstream-commit: 749d90e10f989802638ae542daf54257f3bf71f2
Component: engine
2017-04-24 18:43:07 -07: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
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
8cc7c79d45
Merge pull request #32654 from allencloud/use-make-slice-to-store-swarmkit-objects
...
use make slice to store cluster objects to improve efficiency
Upstream-commit: a709f79c1a98c3661f12397fe61f0e6a46f1dbb3
Component: engine
2017-04-22 12:02:34 -04:00
66bc4368bf
Merge pull request #32723 from alvin319/master
...
Add examples of storage-opts and log-opts for the daemon
Upstream-commit: 80013fd59a19fa1ddccc7c3d879a4571806024c7
Component: engine
2017-04-21 20:41:45 -05:00
f1f010b701
Enable a unit test on windows.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9484c3bd81fa8aab46b7268c5c3bfeb8e14aa369
Component: engine
2017-04-21 12:31:16 -04:00
6d41c81006
Merge pull request #32761 from lukemarsden/clarify-moby-docker
...
Clarify relationship between Moby and Docker.
Upstream-commit: 0e9148b1e92dc6cf79dc57c71423297d5c11d0ca
Component: engine
2017-04-21 07:58:57 -05:00
ac7cbfcff6
Clarify relationship between Moby and Docker.
...
Signed-off-by: Luke Marsden <me@lukemarsden.net >
Upstream-commit: 8fff9bd0816f3f86c2f84c26c5b102f3de3cca81
Component: engine
2017-04-21 06:20:46 -05:00
178e6f9ebd
Merge pull request #32632 from ColinHebert/compose_add_labels_during_build
...
Add support for labels during build with compose
Upstream-commit: bb5dfdb8c5acd48f17498b111db360820a50baec
Component: engine
2017-04-21 10:16:48 +02:00
a4980cfd50
Update dockerd.md
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: 427a521b025afaa967c701e234f5366cc633cf77
Component: engine
2017-04-20 21:56:21 -05:00
14f3956c8e
Merge pull request #32691 from moby/moby
...
Updated README: a new upstream project to break up Docker into independent components
Upstream-commit: 7f927516eae370aff1e7993ff43e4d99c409e126
Component: engine
2017-04-20 17:32:32 -05:00
c2513f1e56
project: setting a new scope starting the Moby Project
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 252f7246a740b7a1d502638b4026ec81f359e0e1
Component: engine
2017-04-20 17:25:19 -05:00
63ddf44cbf
Add Moby Project logo
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: d8413b86c09f643d970206ccd16fee35900da7bd
Component: engine
2017-04-20 17:03:21 -05:00
9019dbd01c
Merge pull request #32668 from darrenstahlmsft/CleanupEmpty
...
Windows: Do not clean empty windowsfilter folder
Upstream-commit: b8e9250b59de8619b94f7532c0fc182913028f1e
Component: engine
2017-04-20 14:55:45 +02:00
ac65b0c3b9
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: 50368e7a0ebc654689e3932dea588612e3496823
Component: engine
2017-04-20 07:18:25 -05:00
db947691c9
Merge pull request #32713 from vdemeester/integration-cli-move-fakegit
...
[integration] Move fakegit to its own package in cli
Upstream-commit: 7936a962dc5f0f97fa2195c9497bc6e21e13fc2e
Component: engine
2017-04-19 20:30:47 -05:00
3ba3666c3a
Add examples of storage-opts and log-opts for the daemon
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: c79bf50ba6cd68267f3d87f40dcd25167b750ea4
Component: engine
2017-04-19 16:35:47 -05:00
f5ac07a8d7
[integration] Move fakegit to its own package in cli
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a582d9dc42abd96bd88197939e082a1ea3c938a7
Component: engine
2017-04-19 15:52:03 +02:00
987b06e286
Use cli for trusted relate command
...
This also removed some skipped test (that are skipped for a long while).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0ba39d4312ff20b11fc777092cc0c3e5ddeb19f
Component: engine
2017-04-19 14:04:39 +02:00
3492680b4d
Merge pull request #32692 from tiborvass/add-readme-header
...
Add note about the transition to Moby in the README
Upstream-commit: 4bcb02b785bc84ae9f163d936e1f9734ab59c865
Component: engine
2017-04-18 10:06:24 -05:00
b20f1e21b6
Add note about the transition to Moby in the README
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fe3797d9865c808b1d47469d3b4ace03ea4ae206
Component: engine
2017-04-18 10:04:08 -05:00
d2b501cbdb
Remove bogus statement from bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ee785b1b9864e1f77ff04c684949a7f09f1d4934
Component: engine
2017-04-18 10:50:02 +02:00
b70b785207
Use a test table in the daemon delete unit tests
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 8f51746997e4ea26fdc80703d3e9c881b87816f2
Component: engine
2017-04-18 10:30:40 +03:00
70222af7e7
Merge pull request #32647 from vdemeester/integration-runSleepingContainer-using-cli
...
[integration] make runSleepingContainer use cli package
Upstream-commit: 3482b45e60eee8086d0c1bcee8b7298dc90bb6d6
Component: engine
2017-04-18 08:35:55 +02:00
7a295107af
Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8
...
Vendor swarmkit 61a92e8
Upstream-commit: cd4c089b9e026317ea85e816b1323cf6465b662b
Component: engine
2017-04-17 23:24:43 -05:00
25a20bf925
Merge pull request #32669 from darrenstahlmsft/FixTmpDelete
...
Fix tmp deletion
Upstream-commit: 64932563c91eccec589c02c788a179799fbe5ac6
Component: engine
2017-04-17 23:13:54 -05:00
347c2cd583
Windows: Do not attempt to clean empty windowsfilter folder
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5e4e357f6e53ed9aeb0d4988d8c780acd5da3ed5
Component: engine
2017-04-17 13:10:15 -07:00
1053121285
Fix tmp folder deletion
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5cea9a0aa557401447d440ce2286be19f8fe3cc2
Component: engine
2017-04-17 13:09:40 -07:00
