Commit Graph
36900 Commits
Author SHA1 Message Date
Darren Stahl 037393eab4 Prevent a non-zero NanoCPUs from setting a zero CPU.Count
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: b3649f4065984d16d2834b33f3f2d9f79c92603e
Component: engine
2017-04-26 11:05:32 -07:00
Julien Maitrehenry 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
Ying Li bffd287a59 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: b0401a71f7479a52b2670346e0d1e97cb68089a4
Component: engine
2017-04-26 10:45:12 -07:00
Daniel Nephin e0163aef4b Merge pull request #8 from tiborvass/fix-windows
windows: remove workaround for go#15286 and have compiling work on windows
Upstream-commit: 728060a7eb
Component: cli
2017-04-26 10:23:35 -04:00
Vincent Demeester 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
Evan Hazlett d22ad9d497 remove service runtime filter in stack command
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 95e6c848b112af982ef28ed12317a027973408e4
Component: engine
2017-04-26 09:11:51 -04:00
Vincent Demeester 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
Dave Tucker 619e402989 builder: Make builtin arg pruning work with > 1 arg
The previous implementation would error out with "Unexpected EOF" which
was caused by an underlying "array index out-of-bounds" error.
The root cause was deleting items from the same array that was being
iterated over. The iteration was unaware that the array size had
changed, resulting in an error.

The new implementation builds a new array instead of mutating a copy of
the old one.

Fixes: #32744

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 1076ab58ec92637a1a157d8dfbb7625d7bba6c40
Component: engine
2017-04-26 10:24:58 +01:00
Daehyeok Mun e744d7cc6c Remove unnecessary line
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: 145dfd924c8489cb2099bc1a86a01cd1fff19b70
Component: engine
2017-04-26 01:20:10 -06:00
Kenfe-Mickaël Laventure 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
John Howard 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
John Howard 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
Victor Vieux 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
Aaron Lehmann 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
Tibor Vass 8ef7f9b38c windows: remove workaround for go#15286 and have compiling work on windows
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 97a4da4cf1
Component: cli
2017-04-25 15:53:23 -07:00
Tonis Tiigi 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
Evan Hazlett 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
Aaron Lehmann 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
Gaetan 8f4985c526 Merge pull request #3 from gdevillele/add-makefile
add Makefiles
Upstream-commit: b37ea22b1e
Component: cli
2017-04-25 09:58:40 -07:00
Gaetan de Villele 2c780f4003 add Makefiles and document their use in the README
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: fb413981d3
Component: cli
2017-04-25 09:57:06 -07:00
Gaetan 52ef86e5a9 Merge pull request #5 from gdevillele/add-gitignore
add gitignore file
Upstream-commit: 0f0b500cf3
Component: cli
2017-04-25 09:47:56 -07:00
Vincent Demeester 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
Boaz Shuster 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 443e26b99c Merge pull request #6 from aduermael/fix-path
fix docker/docker/cli path in comment
Upstream-commit: a01a35fb84
Component: cli
2017-04-25 09:33:17 +02:00
Vincent Demeester 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
Aaron Lehmann 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
Julien Kassar 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
Stephen J Day 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
Antonio Murdaca 9432bd8249 Switch to using opencontainers/selinux for selinux bindings
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: abbbf914986d6d0ea15923f9a57a99465791bc83
Component: engine
2017-04-24 21:29:47 +02:00
Adrien Duermael a99e2613c0 fix docker/docker/cli path in comment
Signed-off-by: Adrien Duermael <adrien@duermael.com>
Upstream-commit: 763802b6a3
Component: cli
2017-04-24 11:31:08 -07:00
Daniel Nephin 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
Daniel Nephin 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
Tõnis Tiigi 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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kenfe-Mickaël Laventure 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
John Howard 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
Vincent Demeester 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
Vincent Demeester 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
John Howard 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
Ignacio Capurro 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Brian Goff 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
Misty Stanley-Jones 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
Daniel Nephin 4d8e68b211 Merge pull request #1 from dnephin/add-dockerfile
Add Dockerfile and fix vendor.conf
Upstream-commit: bbee80a62e
Component: cli
2017-04-21 13:19:54 -04:00