Commit Graph
4138 Commits
Author SHA1 Message Date
Kenfe-Mickaël LaventureandGitHub 64486d7820 Merge pull request #255 from albers/system-prune-volume-warning
system prune: only warn for volumes if --volumes is given
2017-06-29 08:50:16 -07:00
Harald Albers 849b0e96a0 system prune: only warn about volumes if --volumes is given
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-29 15:07:21 +02:00
Vincent DemeesterandGitHub 4c88a1cb53 Merge pull request #262 from cdrage/on-failure-error
on_failure -> on-failure in compose code
2017-06-29 09:04:15 +02:00
Vincent DemeesterandGitHub e4e08baeba Merge pull request #258 from adshmh/fix-daemon-unit-tests-output-leak
fixed output leak from daemon unit tests
2017-06-29 09:03:51 +02:00
Sebastiaan van StijnandGitHub 0ec3e8a8d5 Merge pull request #215 from imkin/default-max-size-param-doc
Adding docs for "overlay2.size" storage-opt
2017-06-28 14:23:34 -07:00
Charlie Drage d3f9a6c610 on_failure -> on-failure in compose code
on_failure should be on-failure

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2017-06-28 11:10:02 -04:00
Vincent DemeesterandGitHub 92a2a1d539 Merge pull request #260 from aaronlehmann/verify-message
progress: Show success message when finished counting down
2017-06-28 09:30:49 +02:00
Dhawal Yogesh Bhanushali ff2552f7a1 Adding docs for "overlay2.size" storage-opt
Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
2017-06-27 23:58:57 -07:00
Aaron Lehmann 82e069026b progress: Show success message when finished counting down
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-27 15:07:10 -07:00
Arash Deshmeh 69b226a89c fixed the output leak from daemon unit tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-27 14:22:49 -04:00
Sebastiaan van StijnandGitHub 2eac0bb7b7 Merge pull request #230 from mstanleyjones/remove-userns-details
Remove specific config info about userns-remap
2017-06-26 21:11:53 -07:00
Sebastiaan van StijnandGitHub 8fc3179111 Merge pull request #225 from mstanleyjones/ps-markdown-formatting
Reformat filtering options in ps ref
2017-06-26 21:05:42 -07:00
Sebastiaan van StijnandGitHub cfff0e2259 Merge pull request #207 from cyli/warn-swarm-ca-command
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
2017-06-26 20:56:54 -07:00
Tibor VassandGitHub c3e5445659 Merge pull request #219 from vieux/scale
hide `--detach` for docker < 17.05
2017-06-26 20:47:39 -07:00
Victor Vieux db60f25561 hide --detach for docker < 17.05
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-06-26 18:55:30 -07:00
Victor VieuxandGitHub 0133e13353 Merge pull request #231 from tonistiigi/client-session-fssession
Incrementally sending build context
2017-06-26 17:15:34 -07:00
Sebastiaan van StijnandGitHub 2f58992f85 Merge pull request #237 from aaronlehmann/progress-before-assignment
progress: Show progress of replicated tasks before they are assigned
2017-06-26 17:14:07 -07:00
Tonis Tiigi b95638a5ac Use long running session in builder
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Add incremental context send support

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-26 16:30:01 -07:00
Sebastiaan van StijnandGitHub 3648a8b9d0 Merge pull request #241 from mstanleyjones/master
Fix false Liquid errors
2017-06-26 13:19:04 -07:00
Misty Stanley-Jones 11c1729e00 Fix false Liquid errors
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-26 12:50:34 -07:00
Sebastiaan van StijnandGitHub 298d486d8b Merge pull request #235 from vdemeester/234-fix-warn
Add a line break after warning 👼
2017-06-24 02:17:26 -07:00
Aaron Lehmann d3d09f67b1 progress: Show progress of replicated tasks before they are assigned
This was only showing tasks that belong to nodes that are currently up,
so that tasks on down nodes don't appear to be stuck. But this
unintentionally excludes tasks that haven't been assigned yet, so if a
task is stuck before assignment, for example because no nodes meet its
constraints, a progress bar won't even be shown. The check should only
apply to tasks that have a node assignment.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-23 17:34:59 -07:00
Tonis Tiigi ae8d049f9e fix build issue with updated moby
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 16:12:20 -07:00
Daniel NephinandGitHub 8b6196ded7 Merge pull request #236 from vdemeester/import-displayable-ports-from-moby
Import DisplayablePorts from moby/moby source
2017-06-23 15:01:53 -04:00
Tonis Tiigi 4adf701567 vendor: update moby
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 11:34:22 -07:00
Daniel NephinandTonis Tiigi c60d13e539 Fix cyclomatic complexity of two formatters
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-23 11:34:22 -07:00
Vincent Demeester b7fad8f1dc Add a line break after warning 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 20:15:00 +02:00
Vincent Demeester 9e142cadc9 Import DisplayablePorts from moby/moby source
This has nothing to do in the `api` package for moby as it's just a
cli display function.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 20:12:30 +02:00
Vincent DemeesterandGitHub 0c6b8d717d Merge pull request #221 from dnephin/fix-lint-errors
Fix lint errors merged while new lint branch was in PR
2017-06-23 09:54:12 +02:00
Vincent DemeesterandGitHub ca8e991469 Merge pull request #232 from dnephin/fix-circle-git
Use an image with git and ssh for circleCI
2017-06-23 09:37:18 +02:00
Sebastiaan van StijnandGitHub aefbc9d8f7 Merge pull request #202 from ripcurld0/fix_32235_moby
Unmarshal a number as a Number in RawInspectFallback
2017-06-22 23:12:50 -07:00
Daniel Nephin 74c1388f66 Use an image with git and ssh for circleCI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-22 19:51:36 -04:00
Misty Stanley-Jones 8222baf263 Remove specific config info about userns-remap
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-22 15:09:14 -07:00
Vincent DemeesterandGitHub ae2c3ffb40 Merge pull request #226 from mstanleyjones/typo-fix-auth
Fix small typo
2017-06-22 10:01:24 +02:00
Vincent DemeesterandGitHub 53ac8bbed8 Merge pull request #228 from seemethere/wrap_pwd
Fix mounts for directories with weird chars
2017-06-22 09:59:41 +02:00
Eli Uriegas 1119e992f2 Fix mounts for directories with weird chars
Fixes:
`make -f docker.Makefile binary`

When directories have characters like `&&` they must be wrapped in
quotes or else the docker run command will fail.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-21 17:47:40 -07:00
Misty Stanley-Jones ede69a38c2 Fix small typo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-21 11:06:26 -07:00
Misty Stanley-Jones 0888df3058 Reformat filtering options in ps ref
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-21 10:31:03 -07:00
Daniel NephinandGitHub edfc89f4de Merge pull request #152 from dnephin/improve-volume-parse
Improve volume spec parsing
2017-06-21 11:45:20 -04:00
Vincent DemeesterandGitHub 4b1055aaa6 Merge pull request #222 from thaJeztah/carry-moby-33290
Explain `stack deploy` with multiple Compose files
2017-06-21 17:36:20 +02:00
Daniel Nephin 732261f774 Use compose volume spec parser for container volume flag
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:16:04 -04:00
Daniel Nephin db6ff357a7 Some improvements to compose volume spec parsing
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:13:52 -04:00
Boaz Shuster 9a2f2d769d Unmarshal a number as a Number in RawInspectFallback
Running `docker inspect --format "{{.ID}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3983636
While `docker inspect --format "{{.Id}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3.983636e+06

This happens because "Id" is not a field of types.ImageInspect and thus
tryRawInspectFallback is called and converts the raw response into `interface{}`
using a JSON decoder. However, by default that decoder converts numbers into
`float64` unless `UseNumber` is set.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-06-21 13:10:14 +03:00
Vincent DemeesterandGitHub 9f00ec085f Merge pull request #164 from mstanleyjones/clarify-attach
Clarify ability to attach multiple times
2017-06-21 10:59:34 +02:00
Vincent DemeesterandGitHub 93562e94a9 Merge pull request #196 from dnephin/use-circleci-workflow
Use CircleCI workflows
2017-06-21 10:06:31 +02:00
Vincent DemeesterandGitHub d5d0ec56c1 Merge pull request #214 from adshmh/add-unit-tests-to-stack-package
add unit tests to stack package
2017-06-21 10:00:08 +02:00
Sebastiaan van StijnandGitHub e07fbfda7e Merge pull request #216 from thaJeztah/fix-markdown
Fix Markdown formatting of experimental "stacks"
2017-06-20 21:31:07 -07:00
Sebastiaan van Stijn 36fa4af30b Explain stack deploy with multiple Compose files
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.

Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-20 21:23:21 -07:00
Daniel Nephin b84e21cd05 Fix lint errors merged while new lint branch was in PR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 00:11:59 -04:00
Ying Li 32b43bc21a If docker swarm ca is not called with the --rotate flag, the other
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
2017-06-20 18:55:10 -07:00