beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31692 commits 14 branches 412 tags 338 MiB
Commit graph

31692 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
9c0473fa65 Merge pull request #32222 from unclejack/small_cleanup 
Small cleanup
 2017-03-30 21:09:39 +02:00
Sebastiaan van Stijn
2ce39de0c8 Merge pull request #32010 from dongluochen/swarmkit_vendor 
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
 2017-03-30 17:24:33 +02:00
Evan Hazlett
59aed5ab36 Merge pull request #32174 from KarthikNayak/32113 
Dockerd: enable CORS when only `--api-cors-header` is used
 2017-03-30 11:13:52 -04:00
Vincent Demeester
ee61f28cc3 Merge pull request #32124 from vdemeester/system-inspect-secret 
Add support for `--type=secret` in `docker inspect`
 2017-03-30 17:01:57 +02:00
Brian Goff
c94e0f5d02 Merge pull request #32225 from thaJeztah/remove-flag-constant 
Remove constant for "config-file" flag
 2017-03-30 10:05:07 -04:00
unclejack
a23c456e5a pkg/*: clean up a few issues 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:50:46 +03:00
unclejack
90a44b875c pkg/urlutil: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00
unclejack
20d6f5c2a9 pkg/file{utils,notify}: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00
unclejack
087f7307a6 pkg/{chroot,}archive: clean up a few small issues 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:37:54 +03:00
Vincent Demeester
8305617510 Merge pull request #32213 from aaronlehmann/plugin-build-mac 
plugins: Rename plugins_linux.go to plugins_unix.go and use build tags
 2017-03-30 15:03:32 +02:00
Vincent Demeester
36c2f2731d Merge pull request #32199 from yuexiao-wang/add-examples 
provide `docker stack ps` examples
 2017-03-30 15:02:48 +02:00
yuexiao-wang
dcb4351d38 provide examples 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-03-31 05:11:36 +08:00
Sebastiaan van Stijn
9894576fb7
Remove constant for "config-file" flag 
None of the daemon flags use a constant for the
flag name.

This patch removes the constant for consistency

Also removes a FIXME, that was now in the wrong
location, and added a long time ago in
353b7c8ec7,
without a lot of context (and probably no longer really relevant).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-30 12:01:00 +02:00
Sebastiaan van Stijn
11c2056204 Merge pull request #32221 from harche/patch-2 
Fixing a typo in spelling
 2017-03-30 11:33:06 +02:00
harche
5e1349e083 Fixing a typo in spelling 
Wrong tense used in a sentence

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2017-03-30 14:31:45 +05:30
Vincent Demeester
b214d8d893 Merge pull request #32209 from aboch/vnd 
Vendoring vishvananda/netlink @c682914
 2017-03-30 09:56:02 +02:00
Lei Jitang
f459e3af9e Merge pull request #32197 from FengtuWang/fix_TestDaemonRestartWithInvalidBasesize 
fix TestDaemonRestartWithInvalidBasesize
 2017-03-30 10:15:48 +08:00
Sebastiaan van Stijn
f16d1a47cc Merge pull request #31741 from mlaventure/cleanup-tmp-on-start 
Cleanup docker tmp dir on start
 2017-03-30 03:14:55 +02:00
Sebastiaan van Stijn
165a5c6934 Merge pull request #32013 from albers/completion-secret-ls--format 
Add bash completion for `secret ls --format`
 2017-03-30 03:09:02 +02:00
Aaron Lehmann
85357a1167 Make pkg/devicemapper and pkg/loopback depend on cgo in build tags 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 17:55:42 -07:00
Tibor Vass
5ec88474b7 Merge pull request #32215 from tiborvass/docs-yaml-fix-makefile 
docs: fix Makefile for yaml docs generation
 2017-03-29 16:38:11 -07:00
Aaron Lehmann
8eb7edab7c Add line to hack/make/cross to cross-compile pkgs directory 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 15:58:03 -07:00
Tibor Vass
36bd288162 docs: fix Makefile for yaml docs generation 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-29 15:07:16 -07:00
Aaron Lehmann
3da1192828 plugins: Rename plugins_linux.go to plugins_unix.go and use build tags 
This allows pkg/authorization to build on OS X.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 14:06:59 -07:00
Aaron Lehmann
278b36e5ce Merge pull request #32200 from yuexiao-wang/update-usage 
fix inconsistency for docker service ps
 2017-03-29 13:58:14 -07:00
yuexiao-wang
6d50737355 fix inconsistency for 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-03-30 05:42:18 +08:00
Harald Albers
31a8965dd4 Add bash completion for secret ls --format 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-29 13:54:38 -07:00
Sebastiaan van Stijn
bbae982ac8 Merge pull request #32211 from vieux/stretch_without_lsb 
install: map debian_version 9.X to debian stretch without lsb_release
 2017-03-29 20:56:45 +02:00
Victor Vieux
8d0de1fa8d Merge pull request #32204 from thaJeztah/remove-generated-changelog 
delete generated rpm "changelog"
 2017-03-29 11:47:20 -07:00
Victor Vieux
f8360d002d install: map debian_version 9.X to debian stretch without lsb_release 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-29 11:36:34 -07:00
Alessandro Boch
694c787123 Vendoring vishvananda/netlink @c682914 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-29 10:58:02 -07:00
Sebastiaan van Stijn
089b71443a
delete generated rpm "changelog" 
The generated "changelog" was not removed
before re-generating, causing the changelog
to be added twice on repeated runs of "make rpm"
(when bind-mounting the local source).

As a result, rpms failed to build, because
the resulting file had entries in non-chronological
order.

This change removes the generated file
before re-generating, and adds the file
to .gitignore, to prevent it from
accidentally being added to source control.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-29 18:19:07 +02:00
Sebastiaan van Stijn
bce494f7a2 Merge pull request #31830 from dnephin/refactor-cli-state 
Small cleanup now that we have multiple details about the server stored on the cli
 2017-03-29 13:36:32 +02:00
Sebastiaan van Stijn
1b2f07a2f1 Merge pull request #31501 from thtanaka/update-oracle-selinux 
Update oracle linux selinux to match docker upstream
 2017-03-29 13:15:28 +02:00
Vincent Demeester
0937dadfdf Merge pull request #32196 from vdemeester/fix-windowsrs1-integration 
Fix TestAPIDockerAPIVersion on windows
 2017-03-29 12:45:31 +02:00
Sebastiaan van Stijn
d54c8baca4 Merge pull request #32198 from FengtuWang/wrong_usage 
fix wrong usage in script of integration test
 2017-03-29 12:42:47 +02:00
Sebastiaan van Stijn
6263c3cf2e Merge pull request #32058 from tophj-ibm/flaky-token-test 
Fix flaky test TestPushMisconfiguredTokenServiceResponseError
 2017-03-29 12:30:16 +02:00
Fengtu Wang
a42e72814f fix wrong usage in script of integration test 
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
 2017-03-29 18:23:06 +08:00
Sebastiaan van Stijn
a1099010b0 Merge pull request #32085 from aboch/bd 
Do not panic on redundant UpdateAttachment
 2017-03-29 12:04:05 +02:00
Sebastiaan van Stijn
d9c4261964 Merge pull request #32187 from tianon/tini-version-parsing 
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
 2017-03-29 12:01:03 +02:00
Fengtu Wang
1d74b4f6d4 fix TestDaemonRestartWithInvalidBasesize 
NotNil is expected behaviour, daemon should not start with
invalid base size.

Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
 2017-03-29 17:32:25 +08:00
Vincent Demeester
4180211d80 Merge pull request #32186 from aaronlehmann/cluster-omitempty 
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
 2017-03-29 10:38:52 +02:00
Vincent Demeester
cf19bd44af Merge pull request #29228 from dnephin/add-entrypoint-to-service-cli 
Add entrypoint flags to service cli.
 2017-03-29 10:38:33 +02:00
Vincent Demeester
02faf807a2 Merge pull request #32167 from miaoyq/print-a-err-return 
The returned err should be printed
 2017-03-29 10:36:05 +02:00
Vincent Demeester
8c7fdddf48
Fix TestAPIDockerAPIVersion on windows 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-29 10:28:51 +02:00
Vincent Demeester
1f7fd19cec Merge pull request #32175 from vdemeester/fix-30201 
Fix TestTrustedIsolatedCreate – clean trust folder at the end of the test
 2017-03-29 09:15:51 +02:00
Sebastiaan van Stijn
2c1f6e812a Merge pull request #32189 from vieux/17.03.1-changelog 
backport 17.03.1 CHANGELOG
 2017-03-29 08:23:43 +02:00
Yanqiang Miao
87d0a3ad89 The returned err should be printed 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-03-29 09:00:50 +08:00
Sebastiaan van Stijn
0c59283fc3 Merge pull request #32183 from JimGalasyn/delete-h1 
Delete extraneous H1 title
 2017-03-29 01:42:20 +02:00
Victor Vieux
d5cbaa96f6 backport 17.03.1 CHANGELOG 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-28 16:15:05 -07:00