Commit Graph

4021 Commits

Author SHA1 Message Date
d522560d52 Merge pull request #28019 from sanimej/vendor
Vendoring libnetwork @9ab6e13
Upstream-commit: 2d676d38a0d69ee2f4b126e8fcd48c830ee3796b
Component: engine
2016-11-03 14:35:28 -07:00
1b35413a33 Fix IT case for network name validation
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 9cebccfb95b75e7688b897d74c1eee9eb668526f
Component: engine
2016-11-03 11:04:37 -07:00
6483cebb58 Merge pull request #27873 from duglin/fixContChar
Fix case where \ at EOF made the builder ignore the command
Upstream-commit: ecf405b64de82bbf565bce6e4610c04a29113958
Component: engine
2016-11-03 10:30:15 -07:00
ed09e04a52 Merge pull request #27164 from cpuguy83/carry_24205
Fix volume creates blocked by stale cache entries
Upstream-commit: cf55397e130e6ab04ad723ef014cf49a3b62998e
Component: engine
2016-11-03 10:28:13 -07:00
f6fb29849a Merge pull request #27968 from vieux/add_volume_test
add test plugin install --disable and volume ls
Upstream-commit: 6ee25e6277c930c71ff0e5c68ec6d66845b7f88f
Component: engine
2016-11-03 10:22:52 -07:00
bdd83cf850 Fix volume creates blocked by stale cache entries
When a conflict is found in the volume cache, check with the driver if
that volume still actually exists.
If the volume doesn't exist, purge it from the cache and allow the
create to happen.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6a0bdffc1adf9225c6cca92f741ccafd2f90a618
Component: engine
2016-11-03 11:56:44 -04:00
d1279f3328 Fix case where \\ at EOF made the builder ignore the command
Came from looking at issue #27545

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eaf0b5708fc91ab0c78eeee1a2c9c1251439d4a8
Component: engine
2016-11-03 05:48:49 -07:00
2213e9bb9f cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 273eeb813c1db0f42c2ad5e053972eeb00907568
Component: engine
2016-11-03 07:08:59 +00:00
c39056bb71 add test plugin install --disable and volume ls
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 7236e42046a8e80ac5e35c46b0910859fcbd814d
Component: engine
2016-11-02 17:03:46 -07:00
48c9662bdf Merge pull request #27914 from riyazdf/check-plugins-on-startup
Check authz plugins on daemon startup, add v2 integration tests
Upstream-commit: 4a955dc4d476dd709037805492e7e8e8f10089f9
Component: engine
2016-11-02 13:38:32 -07:00
3b23b168fa Check authz plugins are valid on daemon startup, add integration tests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 2b045027ce32a8f938c83adcf5960f1bffdb3f8f
Component: engine
2016-11-02 11:20:54 -07:00
73b83984cb Fix TestAPIClientVersionOldNotSupported
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 29d21388d5119d12a7433a32914bf96d916afdf5
Component: engine
2016-11-02 09:43:29 -07:00
7a2e0e404b Merge pull request #27974 from yongtang/27969-duplicate-bind-mount
Fix issue related to duplicate identical bind mounts for `docker run`
Upstream-commit: e448a32192f85f084652b3f0d96a3e59d4d63035
Component: engine
2016-11-02 20:26:25 +09:00
7051bd85ce Merge pull request #27883 from mavenugo/na
Copy only the relevant endpoint configs from Attachable config
Upstream-commit: ebf10dc5b01dabaa3bcbb75f40683aa0432ec1e2
Component: engine
2016-11-02 11:50:31 +01:00
21f49a2c56 Fix issue related to duplicate identical bind mounts for docker run
This fix tries to address the issue raised in 27969 where
duplicate identical bind mounts for `docker run` caused additional volumes
to be created.

The reason was that in `runconfig`, if duplicate identical bind mounts
have been specified, the `copts.volumes.Delete(bind)` will not truly
delete the second entry from the slice. (Only the first entry is deleted).

This fix fixes the issue.

An integration test has been added to cover the changes

This fix fixes 27969.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90ce6de50b3e5e39f8417e9804970c0fd1377062
Component: engine
2016-11-01 20:31:34 -07:00
62f0d03ec2 Merge pull request #27920 from mavenugo/npp
Basic IT for plugin-v2 network driver
Upstream-commit: 1966f8e09d6b4bf4d65397f03e35a61bc1f979d8
Component: engine
2016-11-01 17:46:06 -07:00
f3bf70acc7 Merge pull request #27960 from anusha-ragunathan/plugin_teardown
Add plugin cleanup as part of standard TearDownTest.
Upstream-commit: 0aefcd6ab660c21c6f7ed4486ab0033a99b9464a
Component: engine
2016-11-01 17:36:51 -07:00
6e6aed1482 Merge pull request #27908 from Microsoft/jjh/fix27601APIVersion
Windows: Require REST 1.25 or later
Upstream-commit: 70459d6f1ec98fa0aa0bf0d873838a9c4b5d3236
Component: engine
2016-11-01 14:32:32 -07:00
9e9fd11160 Merge pull request #22641 from cpuguy83/build_finalization
Adds ability to flatten image after build
Upstream-commit: 22f3e43e9a35711bb63108f1714840a92a4b138e
Component: engine
2016-11-01 14:30:18 -07:00
100bbd2718 Add plugin cleanup as part of standard TearDownTest.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 3e85271a64d466b65d5415f5096ccfe429becd29
Component: engine
2016-11-01 11:17:33 -07:00
c7c95dc226 Adds ability to squash image after build
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.

Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`

Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 362369b4bbea38881402d281ee2015d16e8b10ce
Component: engine
2016-11-01 13:41:59 -04:00
bedb3b19ee Convert Unused ARG error to warning
Signed-off-by: Addam Hardy <addam.hardy@gmail.com>
Upstream-commit: f150f42009dddb4f9b8d4ceef8763af701b0d0f9
Component: engine
2016-10-31 21:42:50 -05:00
276bac2138 Basic IT for plugin-v2 network driver
Since the plugin APIs have not changed for local-scoped network drivers
between plugin-v1 and v2, a simple test to validate the bootstrapping
and network creation APIs would suffice.

Any network driver specific API validations are handled independent of
plugin v1 or v2 format.

Using a sample v2 network plugin :
https://github.com/mavenugo/test-docker-netplugin/

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 259441c027226683d38080caac7a39d6192c9dfa
Component: engine
2016-10-31 15:43:50 -07:00
b55dfc1ac1 Windows: Require REST 1.25 or later
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f811d5b1288583b4bb4b978e58ca0466236a9a30
Component: engine
2016-10-31 14:33:59 -07:00
b1a5cbe26a Merge pull request #27901 from ripcurld00d/load_stdin_valid
Validate docker-load receives a tar file
Upstream-commit: c600cfa93ccdbebf739a494efcd5742839fc6c6b
Component: engine
2016-10-31 14:23:18 -07:00
39c0d0f084 Merge pull request #27648 from dnephin/swagger-gen-operations
Generated more api types from swagger spec
Upstream-commit: 2fc760496b24cc1d42d5527ec593b0e1b1701d54
Component: engine
2016-10-31 15:33:16 -04:00
2c5782817e Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
2016-10-31 11:19:53 -04:00
913e9a48c1 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
2016-10-31 11:16:02 -04:00
dc10e9a664 Use a config to generate swagger api types
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
2016-10-31 11:13:41 -04:00
d19255532a Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
2016-10-31 11:13:41 -04:00
31c5c30bb3 Generate VolumeList response from the swagger spec
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
2016-10-31 11:13:41 -04:00
5209994e39 Validate docker-load receives a tar file
To load an image from a tar file, you can specify
the tar file in the -i/--input option:
docker load -i image_1.tar

or using stdin:

docker load < image_1.tar
cat image_1.tat | docker load

If the image file isn't given the `docker load`
command gets stuck.

To avoid that, the load makes sure the CLI input is
not a terminal or the `--input` option was set.
If not then an error message is shown.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 4426189b35aee4a64bedfb48604ad342a3a5b946
Component: engine
2016-10-31 15:30:55 +02:00
27e4d0d0fb Windows: Fix COPY file . after WORKDIR
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f0b93b6ed8b4c0776065be972b4d5b4611f25fbf
Component: engine
2016-10-30 13:12:27 -07:00
11be31b1b8 Copy only the relevant endpoint configs from Attachable config
When a container is run on a --attachable network, the endpoint
configs passed by the user were incorrectly overwritten.
Copy the relevant configs instead of overwriting the entire configs.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: c5dd4d70c6ea3371d61409112a45c0573280111d
Component: engine
2016-10-29 17:11:30 -07:00
34bac6f06e Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
092d6f43e2 Merge pull request #27867 from Microsoft/jjh/difftest
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
2016-10-28 16:44:03 -07:00
7523d02582 Merge pull request #27800 from lilybguo/group-add-rm
Service create --group param
Upstream-commit: 91f477b8309fd09f27d613c1c3bfc7afb2fd137c
Component: engine
2016-10-28 14:01:53 -07:00
d280390d0c Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape
Fix dockerfile parser with empty line after escape
Upstream-commit: c5adc271b2991c1eb8a25cdab14e425edb2cd99b
Component: engine
2016-10-28 13:53:15 -07:00
ed2e1f6e2b Service create --group param
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
5b866e7f54 Adds container health support to docker ps filter
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 1a149a0ea59b6653e0ba14599476bfe19c4c33f3
Component: engine
2016-10-28 15:43:04 -04:00
66e7a8f02f Windows: Port a docker diff test
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5cab19a08b9a29a22ee956de4520fceab2be5e3b
Component: engine
2016-10-28 12:21:54 -07:00
3b745bdb00 Merge pull request #26464 from vdemeester/11065-stop-signal-and-restart-policies
Taking stop-signal into account when docker kill
Upstream-commit: 9e436c9aad389de27f008cbf404fd907b23baa25
Component: engine
2016-10-28 11:08:55 -07:00
bf7ee1cb20 Merge pull request #26837 from AkihiroSuda/newtmpfs
api: add TypeTmpfs to api/types/mount
Upstream-commit: 87ddc8b0a51248da4f9ab60b92901425c888282f
Component: engine
2016-10-28 19:21:26 +02:00
ecffd5b73a api: add TypeTmpfs to api/types/mount
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 18768fdc2e76ec6c600c8ab57d2d487ee7877794
Component: engine
2016-10-28 08:38:32 +00:00
dad340cfb8 Merge pull request #25800 from vdemeester/25798-fix-event-actions
Fix 25798 : Allow "partial/prefix" filter for health_status, exec_create and exec_start events
Upstream-commit: 10d77b878c473d5e85318aa889a74f1a31559bea
Component: engine
2016-10-28 05:20:49 +02:00
5c99e2a951 Merge pull request #27805 from Microsoft/jjh/fixbuildercache
Windows: Fix builder cache bug
Upstream-commit: 9e206b551288c5197a2523ad0f887341972d75c8
Component: engine
2016-10-28 02:49:40 +02:00
fede704b07 Merge pull request #25820 from crosbymichael/prom
Add metrics output to docker
Upstream-commit: 33474a11fea50d50c1d365b29b94b978b2b6fff7
Component: engine
2016-10-27 16:44:26 -07:00
781e5170af Fix some event filtering
Make it possible to use health_status, exec_start and exec_create as
is in event filter. This way, using `health_status` as filter will allow
to get all health_status events (healthy, unhealthy, …) instead of
having to us all combination (`health_status: healthy`, `health_status:
unhealthy`, …). Same goes for `exec_start` and `exec_create`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 71d8313ad415b8ec6efff3e88f48b5465f30c9a9
Component: engine
2016-10-27 16:14:13 -07:00
2c36e772da Merge pull request #24844 from yongtang/24712-create-service-env-file
Add `--env-file` flag to `docker create service`
Upstream-commit: 322f88f3679efa3267e3ea01330fbedfeb059e9a
Component: engine
2016-10-27 13:40:51 -07:00