Sebastiaan van Stijn
358ed9d030
Merge pull request #244 from thaJeztah/tiny-builder-docs-improvements
...
Some builder docs improvements
Upstream-commit: 40a636efc1
2017-06-29 18:34:03 -07:00
Sebastiaan van Stijn
129c66c19b
Some builder docs improvements
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29b419eed5
2017-06-29 14:20:16 -07:00
Vincent Demeester
d8218cc6ef
Merge pull request #227 from dnephin/expose-config
...
expose config credentials without needing the Cli
Upstream-commit: 74af31be7f
2017-06-29 19:11:37 +02:00
Vincent Demeester
c54c912237
Merge pull request #238 from vdemeester/update-go-connections
...
Update go-connections dependency
Upstream-commit: 8de604c857
2017-06-29 18:04:27 +02:00
Kenfe-Mickaël Laventure
38c47208e6
Merge pull request #255 from albers/system-prune-volume-warning
...
system prune: only warn for volumes if --volumes is given
Upstream-commit: 64486d7820
2017-06-29 08:50:16 -07:00
Harald Albers
7b10a8b5c9
system prune: only warn about volumes if --volumes is given
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 849b0e96a0
2017-06-29 15:07:21 +02:00
Vincent Demeester
2483818fef
Merge pull request #262 from cdrage/on-failure-error
...
on_failure -> on-failure in compose code
Upstream-commit: 4c88a1cb53
2017-06-29 09:04:15 +02:00
Vincent Demeester
fcdcc589ed
Merge pull request #258 from adshmh/fix-daemon-unit-tests-output-leak
...
fixed output leak from daemon unit tests
Upstream-commit: e4e08baeba
2017-06-29 09:03:51 +02:00
Sebastiaan van Stijn
5570d38a23
Merge pull request #215 from imkin/default-max-size-param-doc
...
Adding docs for "overlay2.size" storage-opt
Upstream-commit: 0ec3e8a8d5
2017-06-28 14:23:34 -07:00
Charlie Drage
f397c29ebe
on_failure -> on-failure in compose code
...
on_failure should be on-failure
Signed-off-by: Charlie Drage <charlie@charliedrage.com >
Upstream-commit: d3f9a6c610
2017-06-28 11:10:02 -04:00
Vincent Demeester
d034f04bc4
Merge pull request #260 from aaronlehmann/verify-message
...
progress: Show success message when finished counting down
Upstream-commit: 92a2a1d539
2017-06-28 09:30:49 +02:00
Dhawal Yogesh Bhanushali
241ddf7729
Adding docs for "overlay2.size" storage-opt
...
Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com >
Upstream-commit: ff2552f7a1
2017-06-27 23:58:57 -07:00
Aaron Lehmann
ad9f81da7f
progress: Show success message when finished counting down
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 82e069026b
2017-06-27 15:07:10 -07:00
Arash Deshmeh
2bf9a1e1f5
fixed the output leak from daemon unit tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 69b226a89c
2017-06-27 14:22:49 -04:00
Vincent Demeester
ac616d52fb
Rename NewConfigFile to New in configfile package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 105b21d1ab
2017-06-27 16:31:38 +02:00
Daniel Nephin
284dc93fb1
Add missing unit tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 62dfbef4d8
2017-06-27 13:46:47 +02:00
Daniel Nephin
2f4e7d39ca
Move credential getting functions to the ConfigFile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a3cbc70147
2017-06-27 13:46:47 +02:00
Daniel Nephin
c380487034
Cleanup config/credentials, remove dependency on config file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 33cbb70270
2017-06-27 13:45:50 +02:00
Daniel Nephin
4682e5be27
Move config file loading to more appropriate packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a8c70e43a3
2017-06-27 13:45:50 +02:00
Sebastiaan van Stijn
59836240bc
Merge pull request #230 from mstanleyjones/remove-userns-details
...
Remove specific config info about userns-remap
Upstream-commit: 2eac0bb7b7
2017-06-26 21:11:53 -07:00
Sebastiaan van Stijn
146ac6efc7
Merge pull request #225 from mstanleyjones/ps-markdown-formatting
...
Reformat filtering options in ps ref
Upstream-commit: 8fc3179111
2017-06-26 21:05:42 -07:00
Sebastiaan van Stijn
f453764eee
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
Upstream-commit: cfff0e2259
2017-06-26 20:56:54 -07:00
Tibor Vass
0fcd0709a5
Merge pull request #219 from vieux/scale
...
hide `--detach` for docker < 17.05
Upstream-commit: c3e5445659
2017-06-26 20:47:39 -07:00
Victor Vieux
5323af3564
hide --detach for docker < 17.05
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: db60f25561
2017-06-26 18:55:30 -07:00
Victor Vieux
bc7c33134c
Merge pull request #231 from tonistiigi/client-session-fssession
...
Incrementally sending build context
Upstream-commit: 0133e13353
2017-06-26 17:15:34 -07:00
Sebastiaan van Stijn
99068fccc9
Merge pull request #237 from aaronlehmann/progress-before-assignment
...
progress: Show progress of replicated tasks before they are assigned
Upstream-commit: 2f58992f85
2017-06-26 17:14:07 -07:00
Tonis Tiigi
f1b5e42df0
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 >
Upstream-commit: b95638a5ac
2017-06-26 16:30:01 -07:00
Sebastiaan van Stijn
daace4e1a1
Merge pull request #241 from mstanleyjones/master
...
Fix false Liquid errors
Upstream-commit: 3648a8b9d0
2017-06-26 13:19:04 -07:00
Misty Stanley-Jones
6c88b7bdd9
Fix false Liquid errors
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 11c1729e00
2017-06-26 12:50:34 -07:00
Vincent Demeester
6e00d88916
Update go-connections dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9f34e340b3
2017-06-24 12:40:26 +02:00
Sebastiaan van Stijn
d0a0bd4e19
Merge pull request #235 from vdemeester/234-fix-warn
...
Add a line break after warning 👼
Upstream-commit: 298d486d8b
2017-06-24 02:17:26 -07:00
Aaron Lehmann
3b769b27be
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 >
Upstream-commit: d3d09f67b1
2017-06-23 17:34:59 -07:00
Tonis Tiigi
ec6218872a
fix build issue with updated moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ae8d049f9e
2017-06-23 16:12:20 -07:00
Daniel Nephin
a2d1e59fe3
Merge pull request #236 from vdemeester/import-displayable-ports-from-moby
...
Import DisplayablePorts from moby/moby source
Upstream-commit: 8b6196ded7
2017-06-23 15:01:53 -04:00
Tonis Tiigi
d33398c2c4
vendor: update moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4adf701567
2017-06-23 11:34:22 -07:00
Daniel Nephin
a254f57702
Fix cyclomatic complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c60d13e539
2017-06-23 11:34:22 -07:00
Vincent Demeester
61f81c51e1
Add a line break after warning 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b7fad8f1dc
2017-06-23 20:15:00 +02:00
Vincent Demeester
a9a5f68c49
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 >
Upstream-commit: 9e142cadc9
2017-06-23 20:12:30 +02:00
Vincent Demeester
f79cf3c340
Merge pull request #221 from dnephin/fix-lint-errors
...
Fix lint errors merged while new lint branch was in PR
Upstream-commit: 0c6b8d717d
2017-06-23 09:54:12 +02:00
Vincent Demeester
0ada256ac5
Merge pull request #232 from dnephin/fix-circle-git
...
Use an image with git and ssh for circleCI
Upstream-commit: ca8e991469
2017-06-23 09:37:18 +02:00
Sebastiaan van Stijn
b7706d3788
Merge pull request #202 from ripcurld0/fix_32235_moby
...
Unmarshal a number as a Number in RawInspectFallback
Upstream-commit: aefbc9d8f7
2017-06-22 23:12:50 -07:00
Daniel Nephin
797b9c7a2d
Use an image with git and ssh for circleCI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 74c1388f66
2017-06-22 19:51:36 -04:00
Misty Stanley-Jones
9b6e155e52
Remove specific config info about userns-remap
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 8222baf263
2017-06-22 15:09:14 -07:00
Vincent Demeester
08990efb47
Merge pull request #226 from mstanleyjones/typo-fix-auth
...
Fix small typo
Upstream-commit: ae2c3ffb40
2017-06-22 10:01:24 +02:00
Vincent Demeester
ce6099fcd2
Merge pull request #228 from seemethere/wrap_pwd
...
Fix mounts for directories with weird chars
Upstream-commit: 53ac8bbed8
2017-06-22 09:59:41 +02:00
Eli Uriegas
9fb14cdd14
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 >
Upstream-commit: 1119e992f2
2017-06-21 17:47:40 -07:00
Misty Stanley-Jones
08cdfb1fb9
Fix small typo
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ede69a38c2
2017-06-21 11:06:26 -07:00
Misty Stanley-Jones
c6aa6c7ead
Reformat filtering options in ps ref
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0888df3058
2017-06-21 10:31:03 -07:00
Daniel Nephin
ebe9d0fb69
Merge pull request #152 from dnephin/improve-volume-parse
...
Improve volume spec parsing
Upstream-commit: edfc89f4de
2017-06-21 11:45:20 -04:00
Vincent Demeester
bcbca95cb7
Merge pull request #222 from thaJeztah/carry-moby-33290
...
Explain `stack deploy` with multiple Compose files
Upstream-commit: 4b1055aaa6
2017-06-21 17:36:20 +02:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Vincent Demeester
Kenfe-Mickaël Laventure
Harald Albers
Charlie Drage
Dhawal Yogesh Bhanushali
Aaron Lehmann
Arash Deshmeh
Vincent Demeester
Daniel Nephin
Tibor Vass
Victor Vieux
Tonis Tiigi
Misty Stanley-Jones
Daniel Nephin
Eli Uriegas