Commit Graph
37584 Commits
Author SHA1 Message Date
Vincent Demeester 2483818fef Merge pull request #262 from cdrage/on-failure-error
on_failure -> on-failure in compose code
Upstream-commit: 4c88a1cb53
Component: cli
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
Component: cli
2017-06-29 09:03:51 +02:00
Sebastiaan van Stijn cc179a2f74 Merge pull request #33851 from tonistiigi/fix-add-remote
build: fix add from remote url
Upstream-commit: b7ac1571a35ce0df42cf96b0ed91f20c33678d31
Component: engine
2017-06-28 23:53:21 -07:00
Aaron Lehmann 7c4267f69a progress: Add unit tests
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: dd3eae84e1
Component: cli
2017-06-28 17:53:56 -07:00
Nishant Totla 30ba67aee0 Do not add duplicate platform information to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: da85b62001ec390bdc30b321c4a5cd23c17eeb81
Component: engine
2017-06-28 16:01:05 -07: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
Component: cli
2017-06-28 14:23:34 -07:00
Sebastiaan van Stijn 400dd10c7d Merge pull request #33809 from Microsoft/jjh/svmdedicatedscratch
LCOW: Dedicated scratch space for service VM utilities
Upstream-commit: 8b29ba59ccdd4de45fa25137ec5d5a3845f5f5cc
Component: engine
2017-06-28 11:06:46 -07:00
Tonis Tiigi 77cf31b37e add test for filesync path filtering and testutil helper
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4141d8fe5da596e7ee1eec217378aeb684d0a99e
Component: engine
2017-06-28 09:12:36 -07:00
Tonis Tiigi 1c25f0d80a builder: enable path filtering for filesync session
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ad46348d7c9f8a84d61e1ba5f08c8fd0727e4ebc
Component: engine
2017-06-28 09:12:30 -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
Component: cli
2017-06-28 11:10:02 -04:00
Sebastiaan van Stijn 6a011203cd Merge pull request #33857 from yongtang/33856-make-test-unit
Fix build error for `make test-unit`
Upstream-commit: 3d6ab220db348d82310487e3156d445f19dc0661
Component: engine
2017-06-28 00:31:42 -07:00
Vincent Demeester d034f04bc4 Merge pull request #260 from aaronlehmann/verify-message
progress: Show success message when finished counting down
Upstream-commit: 92a2a1d539
Component: cli
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
Component: cli
2017-06-27 23:58:57 -07:00
John Howard 08b4e324e5 Merge pull request #33826 from Microsoft/jjh/lcownits
LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
2017-06-27 22:56:38 -07:00
Yong Tang 7a07cf4db4 Fix build error for make test-unit
This fix tries to address the issue raised by #33856 where
`make test-unit` will result in the failure:
```
...
...
dockerversion/useragent.go:20: undefined: Version
dockerversion/useragent.go:22: undefined: GitCommit
ok  	github.com/docker/docker/api	0.026s	coverage: 68.0% of statements
ok  	github.com/docker/docker/api/errors	0.003s	coverage: 100.0% of statements
FAIL	github.com/docker/docker/api/server [build failed]
make: *** [test-unit] Error 2
```

The issue is because in case of `make test-unit`, `source "${MAKEDIR}/.go-autogen"`
is missing.

This caused the `make test-unit` failure.

This fix adds `source "${MAKEDIR}/.go-autogen"` in `hack/make/test-unit`

This fix fixes #33856.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fac486d0a02d6af2759f6d0e81bd8a23d82d432c
Component: engine
2017-06-28 03:18:55 +00:00
Sebastiaan van Stijn 674cb1c136 Merge pull request #32977 from imkin/30491-default-container-size
Add overlay2.size daemon storage-opt
Upstream-commit: acf855bf10e16b4282cb14f6cc34e378831a22c8
Component: engine
2017-06-27 20:00:02 -07:00
Tibor Vass ca3c2320e6 Merge component 'cli' from git@github.com:docker/cli master 2017-06-28 01:54:52 +00:00
Tibor Vass 22fa507f87 Merge component 'engine' from git@github.com:moby/moby master 2017-06-28 01:51:55 +00:00
Aaron Lehmann b057843522 progress: Show task error in place of progress bar
If a task encounters an error, the interactive "service create" and
"service update" commands should show that error instead of showing a
stuck progress bar.

To validate:

docker service create --detach=false --name broken --restart-condition=none --replicas 3 busybox asdf
and
docker service create --detach=false --name broken --mode global --restart-condition none busybox asdf

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1ef585f65d
Component: cli
2017-06-27 15:12:31 -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
Component: cli
2017-06-27 15:07:10 -07:00
Sebastiaan van Stijn 8266f5c84f Merge pull request #33838 from lixiaobing1/masterRange
optimize for loop with rootfs.DiffIDs
Upstream-commit: 74a5b14c80022392c17100e1cde6727842eceb6f
Component: engine
2017-06-27 14:34:10 -07:00
John Howard 9a5747b3f9 LCOW: Fix nits from 33241
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4ec9766a27ffb964cec6b8b2745725965b2644aa
Component: engine
2017-06-27 11:59:49 -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
Component: cli
2017-06-27 14:22:49 -04:00
John Howard 92d764e7fb LCOW: Dedicated scratch space for global service VM
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d1d649c891c8b06567afba7542ea9bf518cdaa02
Component: engine
2017-06-27 10:55:16 -07:00
Tonis Tiigi 4c52cfc0fb build: fix add from remote url
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2981667e11e24e9e1e61252a40ceb11fd7cb9811
Component: engine
2017-06-27 10:38:01 -07:00
Brian Goff 59255c95cd Merge pull request #33832 from glasser/glasser/msg-source
Fix stderr logging for journald and syslog
Upstream-commit: 7843bfde36d9ded6fada32f469fe1790316137ae
Component: engine
2017-06-27 13:30:41 -04:00
Victor Vieux 50b9ac741e Merge pull request #33690 from raja-sami-10p/pkg/authorization
Increase test Coverage of pkg/authorization
Upstream-commit: 48e625ccca176787d56a6e87a0e2cc779ce5b6d3
Component: engine
2017-06-27 10:09:13 -07:00
Victor Vieux 37752ce207 add --detach to docker scale
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 6c6b1091d9
Component: cli
2017-06-27 09:55:10 -07:00
Harald Albers d4b74e4fd3 Add bash completion for service create|update --network-(add|rm)
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fa0f470a5f
Component: cli
2017-06-27 17:43:05 +02:00
Harald Albers 2d54e9fa16 Add bash completion for service create|update (update|rollback)-order
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 71dd0e0b66
Component: cli
2017-06-27 17:32:43 +02:00
Vincent Demeester e3e93a641f Merge pull request #33696 from thaJeztah/fix-git-clone
Fix handling of remote "git@" notation
Upstream-commit: 151c5ea798c476128708a91fda8644a6889c2091
Component: engine
2017-06-27 16:56:11 +02:00
Harald Albers 7fb6cb009c Add bash completion for system prune --volumes
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 36b572dfdf
Component: cli
2017-06-27 16:37:41 +02:00
Vincent Demeester ac616d52fb Rename NewConfigFile to New in configfile package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 105b21d1ab
Component: cli
2017-06-27 16:31:38 +02:00
Harald Albers 55b50a2ecf Add bash completion for plugin events
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f0f7150537
Component: cli
2017-06-27 15:37:14 +02:00
lixiaobing10051267 41493b0fad optimize for loop with rootfs.DiffIDs
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 80b2c326de29552c6ee4072fca75ae00eb3be41a
Component: engine
2017-06-27 20:31:27 +08:00
Daniel Nephin 284dc93fb1 Add missing unit tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 62dfbef4d8
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
2017-06-27 13:45:50 +02:00
Harald Albers 098742e654 Add bash completion for service create --detach
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8baef1098e
Component: cli
2017-06-27 12:58:38 +02:00
Harald Albers 7a7da398c1 Fix bash completion for network create --internal
`--internal` is a boolean option. It was falsely treated as non-boolean.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 12dc9eb11f
Component: cli
2017-06-27 12:39:27 +02:00
Harald Albers 7612cca1fe Add bash completion for service create|update --entrypoint
Also fixes a wrong option: `--arg` should be `--args`.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e0462e8472
Component: cli
2017-06-27 11:54:05 +02:00
Harald Albers b6d365bb3f Add bash completion for label filter of prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8b99b65ca8
Component: cli
2017-06-27 11:28:52 +02:00
Dhawal Yogesh Bhanushali 359031100e Add overlay2.size daemon storage-opt
This commit adds the overlay2.size option to the daemon daemon
storage opts.

The user can override this option by the "docker run --storage-opt"
options.

Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
Upstream-commit: a63d5bc03513755015827d0fe93563240429f1e0
Component: engine
2017-06-27 01:07:48 -07:00
Vincent Demeester 7ef86a57f5 Merge pull request #33835 from Microsoft/jjh/changedir
LCOW: Change directory from lcow to "Linux Containers"
Upstream-commit: 359ed993525eecb5009c7be1a48a9d646a9e235f
Component: engine
2017-06-27 09:33:38 +02:00
John Stephens e2c85453e0 Merge pull request #33815 from jstarks/lcow_command_args
LCOW: pass command arguments without extra quoting
Upstream-commit: bcc8b2bc474ef2536bd4bac93a7b94935efaf57a
Component: engine
2017-06-26 21:46:29 -07:00
John Howard 02efb01414 LCOW: Change to c:\Program Files\Linux Containers
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2c43cbe0d5132618c74de4631c89c541bbafb8c2
Component: engine
2017-06-26 21:26:18 -07:00
John Howard 1c03f9a249 Vendor github.com/jhowardmsft/opengcs v0.0.7
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3f14e25a7f67e0236dfdcde792ac571ca7874c47
Component: engine
2017-06-26 21:24:39 -07:00
Sebastiaan van Stijn 59836240bc Merge pull request #230 from mstanleyjones/remove-userns-details
Remove specific config info about userns-remap
Upstream-commit: 2eac0bb7b7
Component: cli
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
Component: cli
2017-06-26 21:05:42 -07:00