dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-15 12:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,916 Commits 19 Branches 583 Tags
634f54a047bfcd2ac95bdcdfe04da7eabe02cbec
Commit Graph

25916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen J Day
634f54a047 api/client/service: mount option defaults and aliases 
Simplifies the mount option usage by providing common aliases for
`source` and `target`. The default mount type is now volume.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-07-21 17:31:33 -07:00
Sebastiaan van Stijn
0a8a6f2dd7 Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type 
Change mount-types to lowercase
 2016-07-22 00:03:55 +02:00
Sebastiaan van Stijn
2b3148c720 Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit 
Harmonize containerd commit used by all Dockerfile
 2016-07-21 23:18:41 +02:00
Sebastiaan van Stijn
8cbe6541b2 Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases 
Extend deprecation cycle to 3 releases by default
 2016-07-21 21:06:57 +02:00
Brian Goff
8a19c13d32 Merge pull request #24874 from abronan/update_libkv 
Vendoring libkv @v0.2.1
 2016-07-21 14:28:01 -04:00
Sebastiaan van Stijn
c435045c30 Merge pull request #24846 from michael-holzheu/24748-s390x-update-jessie-glibc 
Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5
 2016-07-21 19:44:54 +02:00
Kenfe-Mickael Laventure
d5cbc57eff Harmonize containerd commit used by all Dockerfile 
When #24648 was merged, only the main Dockerfile was updated with the
new containerd commit, this commit brings the other Dockerfile up to
speed.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-21 10:34:30 -07:00
Michael Holzheu
81dc979022 Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5 
The glibc of Debian Jessie contains the following two bugs:

 https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
 https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e

The CI tests hang because the bugs affect the gccgo runtime of the
s390x/gcc images.

Now the fixes have been integrated to glibc 2.19-18+deb8u5 in
"proposed-updates" for Debian Jessie:

 https://anonscm.debian.org/cgit/pkg-glibc/glibc.git/log/?h=jessie
 https://release.debian.org/proposed-updates/stable.html

It is expected that the package should be part of the next stable point
release (8.6) in about one to two months from now.

In order to enable CI for s390x earlier, we now explicitely update
the glibc in Dockerfile.s390x to the proposed-updates version.

After Debian 8.6 is released we can remove this change again.

Closes #24748

Suggested-by: Tianon Gravi <admwiggin@gmail.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-07-21 08:48:43 -04:00
Sebastiaan van Stijn
2debfe8435 Merge pull request #24892 from thaJeztah/fix-label-formatting-example 
docs: improve formatting and highlighting of docker ps reference
 2016-07-21 12:38:45 +02:00
Vincent Demeester
22d020276c Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy 
Send registry auth token for service deploy
 2016-07-21 12:33:33 +02:00
Sebastiaan van Stijn
07ef0a37f8 docs: improve formatting and highlighting of docker ps reference 
this improves the formatting, and code-highlighting
of the `docker ps` reference page, and wraps sentences
to 80 chars

also adds single quotes around the formatting
example for labels.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-21 12:27:39 +02:00
Sebastiaan van Stijn
bdf4d9c1cd Merge pull request #24884 from Microsoft/jjh/TestBuildWorkdirWindowsPath 
Windows: TestBuildWorkdirWindowsPath hard code fix
 2016-07-21 11:42:26 +02:00
Sebastiaan van Stijn
8f93128cd6 Change mount-types to lowercase 
these values were changed to lowercase in
690cb2d08c,
but not changed accordingly in docker/docker.

this changes the mounttypes to lowercase

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-21 11:25:42 +02:00
Vincent Demeester
392c546a6a Merge pull request #24888 from fonglh/docs-open-schema-wording 
Clarify API behavior when older versions are called.
 2016-07-21 10:39:21 +02:00
fonglh
f62e24f697 Clarify API behavior when older versions are called. 
Signed-off-by: fonglh <fonglh@gmail.com>
 2016-07-21 16:16:46 +08:00
Vincent Demeester
31b3357c06 Merge pull request #24870 from stevvooe/volume-opt 
api/client/service: shorten to volume-opt
 2016-07-21 09:36:06 +02:00
Vincent Demeester
d458abca4e Merge pull request #24861 from albers/completion-network-driver-macvlan 
Add explicit support for macvlan networks to bash completion
 2016-07-21 09:22:35 +02:00
John Howard
ceed93a874 Windows: TestBuildWorkdirWindowsPath hard code fix 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-20 21:23:38 -07:00
Alexandre Beslic
5189e3d50d update libkv, fix wrong error check on zookeeper list 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2016-07-20 17:25:39 -07:00
Sebastiaan van Stijn
ccd0d83344 Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta 
docs: fix copy/pasta error
 2016-07-21 02:02:28 +02:00
Stephen J Day
a40b5820c9 api/client/service: shorten to volume-opt 
`volume-driver-opt` was too verbose for its own existence and the sanity
of those in the vicinity. The much better, sleeker `volume-opt` replaces
it. 7 bytes and a case of carpal tunnel syndrome are saved!

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-07-20 16:08:36 -07:00
Nishant Totla
a26bdd8607 Send registry auth token for service deploy 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-20 16:07:07 -07:00
Tõnis Tiigi
ea59668046 Merge pull request #24563 from dperny/test-leader-election 
Added leader election test
 2016-07-20 16:02:09 -07:00
Sebastiaan van Stijn
8c6c1aaf07 Merge pull request #24842 from thaJeztah/fix-code-highlight 
docs: add code-hints to builder page
 2016-07-21 00:06:52 +02:00
Sebastiaan van Stijn
83b12c0c11 docs: fix copy/pasta error 
Looks like I copied from the line below, not
from the output :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 23:59:38 +02:00
Sebastiaan van Stijn
eefc17bba1 Merge pull request #24838 from thaJeztah/add-log-options-to-docs 
Add missing --log-driver and --log-opt docs
 2016-07-20 23:50:10 +02:00
Sebastiaan van Stijn
15ad5b5d09 Merge pull request #24864 from thaJeztah/update-plugin-docs 
docs: update reference docs for plugins
 2016-07-20 23:48:26 +02:00
Sebastiaan van Stijn
9d532b5e2d docs: update reference docs for plugins 
the output/response slightly changed in
340964db1c,
and `:latest` is no longer required for
various actions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 23:37:55 +02:00
Sebastiaan van Stijn
4b7a83dbce Merge pull request #24853 from Microsoft/jjh/nanoserver 
Windows: Allow nanoserver image for CLI
 2016-07-20 22:50:08 +02:00
Harald Albers
6c98d5bfac Add manual support for macvlan networks to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-20 13:13:14 -07:00
Vincent Demeester
81ef36c980 Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide 
add how nodes work to how swarm works guide
 2016-07-20 22:08:31 +02:00
Brian Goff
053a4b844a Merge pull request #24859 from albers/completion-syslog-driver-options 
Update completions for syslog log driver options
 2016-07-20 15:47:48 -04:00
Brian Goff
eddb3a2020 Merge pull request #24024 from AkihiroSuda/buildcache2 
mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY
 2016-07-20 15:37:39 -04:00
Charles Smith
137261f97c add how nodes work to how swarm works guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-20 12:37:38 -07:00
Harald Albers
492fdf1f57 Update completions for syslog log driver options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-20 12:35:04 -07:00
Sebastiaan van Stijn
7d84c71500 Merge pull request #24620 from yongtang/24270-service-list-filter 
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
 2016-07-20 21:25:06 +02:00
Sebastiaan van Stijn
a9ca19feaa Merge pull request #24523 from sfsmithcha/clarify_rolling_update 
clarify update-delay and rolling update behavior
 2016-07-20 20:24:18 +02:00
Sebastiaan van Stijn
9fc384cb0b Merge pull request #24852 from thaJeztah/add-stack-services-reference 
docs: add initial reference for "stack services"
 2016-07-20 20:15:52 +02:00
Charles Smith
68a9224bd4 clarify update-delay and rolling update behavior 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-20 10:11:04 -07:00
John Howard
624e6cdbf3 Windows: Allow nanoserver image for CLI 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-20 09:59:52 -07:00
Sebastiaan van Stijn
f49dc528ed docs: add initial reference for "stack services" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 18:56:49 +02:00
Sebastiaan van Stijn
2a78789ad1 Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME 
add command `docker stack services STACKNAME`
 2016-07-20 18:38:08 +02:00
Arnaud Porterie
b9c4959882 Merge pull request #24841 from thaJeztah/rename-bundle-flag 
[RFC] Rename --bundle to --file
 2016-07-20 15:50:54 +00:00
Yong Tang
467107cd40 Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1 
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.

This is part of step to fix #24270.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-20 08:16:54 -07:00
Yong Tang
e734fa58ea Allow partial name match for node ls, and node tasks 
This fix is an extension to last commit to expand the partial
filter to node and task searches.

Additional integration tests have been added to cover the changes.

This fix fixes 24270.
This fix fixes 24112.

Note: A separate pull request will be opened on swarmkit.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-20 08:16:10 -07:00
Sebastiaan van Stijn
d6d02f652c Merge pull request #24843 from resouer/fix-nits 
Fix nits in deprecated
 2016-07-20 16:32:47 +02:00
Sebastiaan van Stijn
b5503ef0a5 docs: add code-hints to builder page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 16:18:44 +02:00
Sebastiaan van Stijn
eb897f490e Merge pull request #24839 from thaJeztah/fix-duplicated-usage 
fix duplicated usage in docs
 2016-07-20 16:07:35 +02:00
Sebastiaan van Stijn
06f35262c4 Rename --bundle to --file 
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.

Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 16:03:27 +02:00
Sebastiaan van Stijn
effbd2b76d fix duplicated usage in docs 
this removes a copy/pasta whoopsie on my side,
introduced in de64324109

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 15:36:02 +02:00