Commit Graph

30357 Commits

Author SHA1 Message Date
d776eee39f Merge pull request #32849 from aaronlehmann/vendor-swarmkit-62d58ee
Vendor swarmkit 8f053c2
Upstream-commit: 230bc34837710050e3205956d5afb35c4242b7c5
Component: engine
2017-05-05 19:20:11 +02:00
5ce7dab3ff Merge pull request #33033 from YuPengZTE/devReadAll
check err
Upstream-commit: b61ffbfb527cf9d9998b8d2c514749a51e7640ae
Component: engine
2017-05-05 22:33:23 +09:00
bf769e943b Merge pull request #32972 from thaJeztah/compose-move-labels-to-3.3
Move "labels" to compose 3.3 format
Upstream-commit: 4662d3e9beab85389a57d12cfe082ba00aabc915
Component: engine
2017-05-05 09:25:43 -04:00
99b906ec9d Merge pull request #32952 from dnephin/refactor-builder-dispatch-state
[Builder] Move dispatch state to a new struct
Upstream-commit: b106dd8b5754c12ffa2b0518faec98798d3e4c3a
Component: engine
2017-05-05 09:00:57 -04:00
cd011dde74 Merge pull request #33035 from YuPengZTE/devCheckpointList
check err
Upstream-commit: 5f0ea4d0164ca722777a74d82174f81925b5c2a2
Component: engine
2017-05-05 14:24:48 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
d2eb631302 Merge pull request #32876 from YuPengZTE/devIneffectualAssignment
delete ineffectual assignment
Upstream-commit: fa4b377bbc4329a5716630c98f50790048058c6c
Component: engine
2017-05-03 20:55:57 +02:00
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
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
0046c26e1e Merge pull request #32949 from dnephin/refactor-streamformatter-and-progress
Refacator pkg/streamformatter
Upstream-commit: 08d7fad45dce832dc03934e9f4fc904899220c96
Component: engine
2017-05-03 09:05:26 -07:00
d3da06632a Fix run with entrypoint in base image
Update a test to use a base image with entrypoint to that the linux build
has at least one test that behaves like all the windows tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d9371ee80764d0eecf7b8a562121f0a6234167a3
Component: engine
2017-05-03 10:59:38 -04:00
8e846811d4 Remove ContainerUpdateCmdOnBuild, it does nothing.
Set a blank entrypoint to preserve the old behaviour.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 97f860716497f6f75236b72e4af90e01afad832c
Component: engine
2017-05-03 10:59:38 -04:00
4886c78246 Fix setting b.runConfig.Image at arbitrary places.
Previously this value was set at some point attrbitrarily between when it was updated and when it was going to be used next.

Instead always set it as the last step of dispatch.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3dcab289821ddd4575b7e48d463ba8ef2af492ea
Component: engine
2017-05-03 10:59:37 -04:00
4486834be5 Merge pull request #32773 from dnephin/refactor-builder-split-commit-2
[Builder] Cleanup unnecessary mutate then revert of b.runConfig
Upstream-commit: d35fc14099b7474ea988fc51b7dee7cbe1659390
Component: engine
2017-05-03 16:39:46 +02:00
19938bf754 Update attach.md
added some clarification around why attach can appear hung to some.  issue #1456 on docs

Signed-off-by: gary schaetz <gary@schaetzkc.com>

Updated the documentation to reflect what happens when you use a fragment in
the docker build url parameter.

Signed-off-by: Gary Schaetz <gary@schaetzkc.com>

added markup for commands

Signed-off-by: Gary Schaetz <gary@schaetzkc.com>
Upstream-commit: a34f9b0bb197674fe2c1c4d3b1b9963e2193071c
Component: engine
2017-05-02 18:09:04 -07:00
b99754c552 Merge pull request #32751 from michaelspets/32748-add-doc
add desc for system events [fixes #32748]
Upstream-commit: 78448765470a6f686daa31495bf2dc5099bda646
Component: engine
2017-05-02 16:15:51 -07:00
f8ce0097a0 Vendor swarmkit 8f053c2
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 077f08bf54dc89d382cbcbd797b2bd7c4867151d
Component: engine
2017-05-02 15:51:26 -07:00
72276b1c4c Merge pull request #32943 from dsheets/docs-dockerd-fix-authz-chain
docs/dockerd: correct authz plugin chain semantics
Upstream-commit: ef20f027cca6a1ec8503a5a96e74e48ef2168760
Component: engine
2017-05-02 15:25:02 -07:00
755f9321e1 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: c87d67b0ad788a6a80d1af89488e2d1f22726c34
Component: engine
2017-05-02 17:38:12 -04:00
620f549c31 Move "labels" to compose 3.3 format
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f522580f588e9e4667a637c4acb62d221ba9b96
Component: engine
2017-05-02 13:35:48 -07:00
063319b6e1 Add swagger spec for /info Log plugins
The `Log` field for plugins was added to `/info` in
17abacb8946ed89496fcbf07a0288fafe24cb7b0 but the swagger spec was not
updated.
This just updates the spec to match reality.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 146e058592b472522824ac28e4b75184eb24358b
Component: engine
2017-05-02 14:42:41 -04:00
e4b93d3405 Merge pull request #32953 from vieux/reports
Add dev report for may 1st
Upstream-commit: fa54c94b9d70c0582012aaef18991e1fb4dd59ba
Component: engine
2017-05-02 10:41:31 -07:00
693a46809d Add dev report for may 1st
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 67ac02d4a6c093f9c796dd4ddd1a185bde63b460
Component: engine
2017-05-02 10:23:56 -07:00
f3f1962192 Merge pull request #32961 from ijc25/re-vndr
Update to latest vndr c56e08229111
Upstream-commit: 0fe924ad983efc9f772551bcc6e5971b8446ea0a
Component: engine
2017-05-02 09:51:57 -07:00
0694cd9f02 Add a proper type to the Source field in Mount
This field was missing a type, which meant that the example objects that Swagger tools generate did not work.

Signed-off-by: Wayne Song <wsong@docker.com>
Upstream-commit: 7a9583693154881f33be7c1b3ba089cdc0dca37f
Component: engine
2017-05-02 09:39:52 -07:00
1d42926659 seccomp: Allow personality with UNAME26 bit set.
From personality(2):

    Have uname(2) report a 2.6.40+ version number rather than a 3.x version
    number.  Added as a stopgap measure to support broken applications that
    could not handle the  kernel  version-numbering  switch  from 2.6.x to 3.x.

This allows both "UNAME26|PER_LINUX" and "UNAME26|PER_LINUX32".

Fixes: #32839

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: cd456433ea2a02ed0016314fc4959b5f1a9c40a3
Component: engine
2017-05-02 15:05:01 +01:00
bd6baf4655 Merge pull request #32937 from dsheets/daemon-info-authz-dont-sort
daemon/info: don't sort authorization plugins as order matters
Upstream-commit: 1d0b921d70824c8cc7ae05fe0a6bdf0b49e50816
Component: engine
2017-05-02 14:10:59 +02:00
effaed887f Merge pull request #32843 from ehazlett/stack-service-filter
Remove service runtime filter in stack command
Upstream-commit: 1504d51701fedc867a5504b98598bee43311cd8a
Component: engine
2017-05-02 14:10:20 +02:00
8fded72012 Update to latest vndr c56e08229111
Changes are:

$ git log --no-merges --oneline 19220953c4a4..c56e08229111
4b76270 Keep "vendor.conf" for reference
ac8f766 travis: update to go 1.8.1
c196644 Better validation of duplicates
e684d5e check for unused packages at the end
3ed2513 detect default gopath($HOME/go)
c9052f3 fix backtick in readme
0e04f23 Missing installation section in README

Changes to moby are the inclusion of several upstream vendor.conf files and
switching to vendoring the toplevel golang.org/x/sync package rather than the
syncmap sub-package due to:

2017/05/02 11:21:06 WARNING: package golang.org/x/sync/syncmap is not root import, should be golang.org/x/sync

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: a28d91349edda7e4e4ecaa5b1e60a238fe515a4d
Component: engine
2017-05-02 11:23:36 +01:00
3f0220808f daemon/info: don't sort authorization plugins as order matters
plugins exist in a chain that composes potentially mutating requests and
responses. This simply reverts the sorting of AuthZ plugins so that the
/info API endpoint returns the internal ordering used for AuthZ composition.

Volume driver plugins are not affected because they are just a set.

Signed-off-by: David Sheets <dsheets@docker.com>
Upstream-commit: cfcf2a0cec8d83c1584020ccaab0c94f5bb6d7d4
Component: engine
2017-05-02 09:39:32 +01:00
dbcc3f98b6 Cleanup all the mutate + defer revert of b.runConfig in the builder
Instead of mutating and reverting, just create a copy and pass the copy
around.

Add a unit test for builder dispatcher.run

Fix two test failures

Fix image history by adding a CreatedBy to commit options. Previously the
createdBy field was being created by modifying a reference to the runConfig that
was held from when the container was created.

Fix a test that expected a trailing slash. Previously the runConfig was being
modified by container create. Now that we're creating a copy of runConfig
instead of sharing a reference the runConfig retains the trailing slash.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9f738cc574d50d0a2accdf6f6deb30405c24a80c
Component: engine
2017-05-01 18:36:53 -04:00
0e66efd28e Add no-new-privileg flag
The daemon config for defaulting to no-new-privileges for containers was
added in d7fda019bb7e24f42f8ae1ddecb3fd52df3c48bf, but somehow we
managed to omit the flag itself, but also documented the flag.
This just adds the actual flag.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ba332a60b24f40007e7ef234c0f44ae5a5ff9d49
Component: engine
2017-05-01 15:31:56 -04:00
3d193f829d Extract squash and tagging from the Dockerfile builder.
Remove pathCache and replace it with syncmap
Cleanup NewBuilder
Create an api/server/backend/build
Extract BuildTagger

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0296797f0f39477d675128c93c1646b3186937ee
Component: engine
2017-05-01 12:07:32 -04:00
dff17659b7 Vendor syncmap
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f07811f7668a931667734fbc6d7bdafce2a2adb3
Component: engine
2017-05-01 11:49:43 -04:00
c430286159 docs/dockerd: correct authz plugin chain semantics
Signed-off-by: David Sheets <dsheets@docker.com>
Upstream-commit: 84812f3f0011dabe9f9520a2d42125f804f66ce7
Component: engine
2017-05-01 15:18:42 +01:00
9c221aedcb Minor grammatical fix
Just a small grammatical correction, but it is unnecessary to repeat "to," after the colon, and deleting it makes the format of the list more consistent and readable.

Signed-off-by: Ryan Cooper <ryan.cooper7@gmail.com>
Upstream-commit: 5cd75dd14cd6427470c3812dd7ccc7095a30a243
Component: engine
2017-05-01 03:30:27 -06:00
79f9dd11cc Merge pull request #32687 from runcom/oci-selinux
Switch to using opencontainers/selinux for selinux bindings
Upstream-commit: 4219156a6254bdc7d270f06742037df8e2708a9a
Component: engine
2017-04-29 19:05:32 +02:00
26325c0024 Merge pull request #32908 from yuexiao-wang/fix-plugin-typos
fix some typos for plugin
Upstream-commit: 42636920d34e02f9bf58e69b5e0b8e44b5fb097f
Component: engine
2017-04-28 19:09:23 -07:00
cede85c141 Merge pull request #32902 from fcrisciani/memberlist_bump
Vendoring memberlist tag 0.1.0
Upstream-commit: 30221cc521234e6f160be3d3f9680abdcd59beab
Component: engine
2017-04-28 18:42:21 -07:00