Commit graph

30431 commits

Author SHA1 Message Date
Vincent Demeester
c0e679660f Merge pull request #30002 from Microsoft/jjh/registerdiffids
Windows: Remove dead code RegisterDiffIDs
2017-01-09 22:43:54 +01:00
Vincent Demeester
d6c8391bf6 Merge pull request #29918 from dongluochen/service_inspect_pretty
add port PublishMode to service inspect --pretty output
2017-01-09 22:43:41 +01:00
Sebastiaan van Stijn
cd82a31edb Merge pull request #29802 from thaJeztah/fix-secret-rm-consistency
Update order of '--secret-rm' and '--secret-add'
2017-01-09 21:34:05 +01:00
Sebastiaan van Stijn
38f766ae0e Merge pull request #29143 from vdemeester/node-cli-unit-tests
Add some unit tests to the node and swarm cli code
2017-01-09 20:52:23 +01:00
Vincent Demeester
fe9f5610c4 Merge pull request #29953 from williammartin/truncindex-iterate-lock
Fix non thread-safe Iteration around go-patricia
2017-01-09 20:23:35 +01:00
Daniel Nephin
e3f083530f Fix parsing resources from compose file for stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-09 14:22:02 -05:00
Tõnis Tiigi
45e88e995a Merge pull request #30001 from runcom/fix-format
devmapper: fixup error formatting
2017-01-09 10:32:35 -08:00
Dong Chen
5470312d23 add port PublishMode to service inspect --pretty output
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2017-01-09 10:30:28 -08:00
Tibor Vass
3e298f46a2 Merge pull request #29955 from vieux/improve_secret_Create
remove -f on secret create and unify usage with other commands
2017-01-09 10:22:39 -08:00
Vincent Demeester
f151c297eb
Add some unit tests to the node and swarm cli code
Start work on adding unit tests to our cli code in order to have to
write less costly integration test.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-09 18:30:15 +01:00
Sebastiaan van Stijn
f199fadc7a Merge pull request #29793 from thaJeztah/improve-run-usage-output
Improve usage output for docker run
2017-01-09 18:15:25 +01:00
William Martin
57dada5338 Fix non thread-safe Iteration around go-patricia
* Unlike other methods in truncindex, Iterate was not locking before
using the Trie, making it potentially race e.g. Delete could result in
setting a child to nil, while Iterate dereferenced that node
while walking the Trie.

Signed-off-by: Petar Petrov <pppepito86@gmail.com>
2017-01-09 17:06:50 +00:00
Sebastiaan van Stijn
f1fdbeca2a Merge pull request #29226 from yongtang/28535-prune-until-follow-up
Add `--filter until=<timestamp>` for `docker container/image prune`
2017-01-09 17:58:01 +01:00
John Howard
02ed83aee9 Windows: Remove dead code RegisterDiffIDs
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-09 08:56:34 -08:00
Alexander Morozov
9248351992 Merge pull request #29846 from thaJeztah/dont-create-init-path
do not create init-dir if not needed
2017-01-09 08:47:51 -08:00
Alexander Morozov
edcfb83b83 Merge pull request #29996 from thaJeztah/unfork-go-memdb
un-fork go-memdb
2017-01-09 08:01:06 -08:00
Antonio Murdaca
8bcbc6711f
devmapper: fixup error formatting
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-01-09 16:58:09 +01:00
Vincent Demeester
4166801f60 Merge pull request #30000 from ralphtheninja/master
Attempts -> MaxAttempts in /services/create
2017-01-09 16:48:56 +01:00
Lars-Magnus Skog
778eeaea20 Attempts -> MaxAttempts in /services/create
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
2017-01-09 16:04:34 +01:00
Sebastiaan van Stijn
f285d5b3e8
do not create init-dir if not needed
commit 56f77d5ade
added support for cpu-rt-period and cpu-rt-runtime,
but always initialized the cgroup path, even if not
used.

As a result, containers failed to start on a
read-only filesystem.

This patch only creates the cgroup path if
one of these options is set.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-09 15:28:51 +01:00
Brian Goff
d0053a34bc Merge pull request #29688 from tronicum/since-flag
explain since format and give examples
2017-01-09 09:27:30 -05:00
Sebastiaan van Stijn
5f057f6350
un-fork go-memdb
commit 9322636c89
temporarily switched to a fork of go-memdb, because
a pull request that was needed was not yet merged
upstream.

this pull request was merged, so we can un-fork
this dependency.

this change does not bump the dependency, and
only un-forks. bumping the dependency should
be done in a separate change, if needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-09 15:05:49 +01:00
Sebastiaan van Stijn
d4791c7b64 Merge pull request #29795 from vdemeester/integration-request-package
[test-integration] Add a new request package in integration-cli
2017-01-09 14:51:40 +01:00
Vincent Demeester
e8e4546bc3 Merge pull request #29874 from allencloud/fix-29872-volume-ls-filter
fix volume ls filter driver
2017-01-09 13:06:17 +01:00
Sebastiaan van Stijn
03d28f75b8 Merge pull request #29989 from yuexiao-wang/fix-url-alias
Fix incorrect alias and URL
2017-01-09 11:59:56 +01:00
yuexiao-wang
9c0b3e1650 Fix incorrect alias and URL
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-01-09 20:14:48 +08:00
Sebastiaan van Stijn
141e1b3eb6 Merge pull request #29985 from lixiaobing10051267/masterEvnfile
fix some typos in runconfig\opts\envfile_test.go
2017-01-09 11:43:31 +01:00
Vincent Demeester
f96180a0a8 Merge pull request #29931 from tonistiigi/test-swarm-errors
Add test for swarm error handling
2017-01-09 11:26:09 +01:00
Vincent Demeester
303b1d200a
Update trustedCmd to be compatible with testutil/cmd
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-09 11:07:05 +01:00
lixiaobing10051267
58da4c1bab fix some typos in runconfig\opts\envfile_test.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-01-09 11:14:18 +08:00
Doug Davis
b532e15036 Merge pull request #29981 from allencloud/fix-nits-in-comments
fix nit in comments
2017-01-08 09:34:43 -05:00
allencloud
847de59934 fix nit in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-08 21:32:30 +08:00
ttronicum
519c35889e explain since format and give examples
Signed-off-by: tronicum <tronicum@user.github.com>
2017-01-08 05:27:54 +01:00
Aaron Lehmann
7c62f58b27 Merge pull request #29963 from stevvooe/use-digest-package
*: use opencontainers/go-digest package
2017-01-07 09:22:50 -08:00
Justin Cormack
91b42cf842 Do not use keyservers to fetch GPG keys for apt
The keyserver infrastructure is unreliable, and just adds another point
of failure without adding any security. Instead, commit the key used at
build time for ZFS to the repo, and inline our signing key into the
install script rather than just its fingerprint.

fix #28510
fix #13555

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-07 12:06:52 +00:00
Stephen J Day
083ad52f60
vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-06 18:48:52 -08:00
Stephen J Day
7a85579917
*: use opencontainers/go-digest package
The `digest` data type, used throughout docker for image verification
and identity, has been broken out into `opencontainers/go-digest`. This
PR updates the dependencies and moves uses over to the new type.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-06 18:48:41 -08:00
Tibor Vass
c43bac064b Merge pull request #29917 from rhvgoyal/output-device-id
devmapper: Return device id in error message
2017-01-06 17:36:18 -08:00
Alexander Morozov
fad6db4465 Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4
Revendor swarmkit to 2e956c4
2017-01-06 17:09:21 -08:00
Doug Davis
ce814b2019 Merge pull request #29956 from tonistiigi/fix-workdir-cache
Fix workdir cache invalidation
2017-01-06 19:40:53 -05:00
Victor Vieux
db6652ca71 remove -f on secret create and unify usage with other commands
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-06 14:07:48 -08:00
Tibor Vass
6d77c02240 Merge pull request #29949 from albers/fix-changelog-create-service
Fix wrong command in changelog
2017-01-06 13:30:00 -08:00
Brian Goff
ec9a05e5e2 Fix conflicts with newly updated selinux policies
The base selinux policies on centos/rhel/oraclelinux have all been
updated in a way that conflicts with the policies we install with
`docker-engine-selinux`. This patch fixes these conflicts.

In addition, removes special cases for old/unsupported versions of
fedora in our selinux package, and change to use a single minimum
version for the selinux base policy package, as this is the minimum
version required to use our selinux policy package.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-06 16:04:24 -05:00
Tonis Tiigi
e160860054 Fix workdir cache invalidation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-06 12:10:59 -08:00
Akihiro Suda
2e3a621523 Merge pull request #29893 from cpuguy83/fix_race_in_plugin_activation
Fix race accessing plugin storage map
2017-01-07 04:48:41 +09:00
Ryan Abrams
7b9ecb9700 Add on-failure to default restart policy
In the event that the docker daemon is managed by systemd and spontaneously
dies the default service configuration does not have docker restart. For people
who just want to install and start docker then never worry about whether docker
is running a better default may be to restart the service on a failure.

Signed-off-by: Ryan Abrams <rdabrams@gmail.com>
2017-01-06 10:23:44 -08:00
Vincent Demeester
ee9bb347a6 Merge pull request #29741 from yuexiao-wang/update-option
keep network options consistent between network connect and run
2017-01-06 19:01:48 +01:00
Sebastiaan van Stijn
fc9d74136b Merge pull request #29841 from wefine/docker_image_tag_input_check
check both source_image_tag and target_image_tag for 'docker image tag'
2017-01-06 17:58:58 +01:00
wefine
a041697cab check both source_image_tag and target_image_tag for 'docker image tag'
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
2017-01-07 04:55:53 +08:00
Sebastiaan van Stijn
b7c2531779 Merge pull request #29899 from Microsoft/jjh/testbuildworkdirimagecmd
Windows: Enable TestBuildWorkdirImageCmd
2017-01-06 17:15:22 +01:00