da85d118fb
Merge pull request #23940 from allencloud/fix-err-msg
...
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
2016-06-24 16:57:01 -04:00
f3ebf274bf
fix error message and typos in swarm cluster
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
2016-06-25 03:10:18 +08:00
5fee17f637
Remove log warning on task update
...
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39c93cfb47783f2531ba44f062fd9a8b351d2224
Component: engine
2016-06-24 12:07:47 -07:00
b45c320ba6
Merge pull request #23914 from tonistiigi/upadate-manager-error-message
...
Add better error messages for unavailable swarm commands
Upstream-commit: e8ec19bd877847ddfd42cae4eddec83088e234fe
Component: engine
2016-06-24 12:02:34 -07:00
299779b4ac
Merge pull request #23360 from sainath14/rename_error
...
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
009e2dd2e1
Add better error messages for unavailable swarm commands
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
2016-06-24 10:14:57 -07:00
a463fd07fe
Merge pull request #23881 from tonistiigi/exec-wait
...
Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine
2016-06-24 11:18:49 -04:00
6af42f8c0d
Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion
...
Fix overlay2 ignoring whiteout files
Upstream-commit: 37fe4bdb59cae499cefb0d8bce8c28b894cd6f98
Component: engine
2016-06-24 01:06:38 +02:00
066b0582fe
Fix overlay2 ignoring whiteout files
...
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.
Fixes #23863
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: bd13c53f8dc1504c9e681dfabef2afc1685ccec7
Component: engine
2016-06-23 13:34:38 -07:00
fbf0465b15
Merge pull request #23790 from tonistiigi/skip-pull
...
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
9d859318a6
Fix error reporting on executor wait
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35
Component: engine
2016-06-22 18:12:51 -07:00
c04403422d
Merge pull request #23829 from LK4D4/cleanup_unused
...
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
f6a8b95a82
Merge pull request #23835 from swernli/loggerfix
...
Fixing file handle leak for "docker logs"
Upstream-commit: 7eae48cd21f12a64c97c76f60412f32a2f1ade78
Component: engine
2016-06-22 11:52:55 -07:00
a75adf3964
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
6e7f3b1cd8
Merge pull request #23738 from psiclops/typos
...
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
2016-06-22 11:56:13 +10:00
675aa5766a
Fixing file handle leak for "docker logs"
...
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container. Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close. This change addresses both cases.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 54f11b84d218c1a7ff4ab4e2148819265da213bc
Component: engine
2016-06-21 18:40:30 -07:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
44cb4a4db6
api,daemon: cleanup some unused stuff
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00
923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
be80ca6785
Skip always pulling images on integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e2226223e614716749cdb7701a130c7449f5f854
Component: engine
2016-06-20 17:45:29 -07:00
f5f0a01144
Fix missing container runtime on upgrade
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d7ceda4e375250e6868854cca96c49a369503745
Component: engine
2016-06-20 11:21:01 -07:00
6a59bd46d7
Merge pull request #23011 from coolljt0725/fix_link
...
Fix link doesn't work sometimes when container start with multiple networks
Upstream-commit: 1bbac428de015a24a0724a9d0990d500c445dcad
Component: engine
2016-06-20 09:42:13 -07:00
f30933141d
Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
...
Update rmi logic for canonical references
Upstream-commit: 1475557341b94ef8d8b2ced1bc4fa49b184cd5ff
Component: engine
2016-06-20 09:35:16 -07:00
d62b2b14a2
Fix misspell typos
...
Signed-off-by: nick <nicholasrusso@icloud.com >
Upstream-commit: 7135afa79b4d99ba2a214fcc1c2decf95f850c2f
Component: engine
2016-06-19 09:53:31 -07:00
20fc079713
Don’t try to restore swarm from incomplete state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
2016-06-18 19:43:47 -07:00
cb1d5362ed
Merge pull request #23707 from mrjana/vendor
...
Vendoring swarmkit @3f135f206179e
Upstream-commit: b014d6a9174cb881dc8a7ff1ac258b343111a27e
Component: engine
2016-06-17 22:47:58 -07:00
1585ae60bd
Merge pull request #23671 from tombee/task-creation-log-debug
...
Change log.printf service creation msg to debug
Upstream-commit: 95074b57c6958cf89e870ddcacbe4ee80ef8b8ad
Component: engine
2016-06-17 20:23:33 -07:00
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
7c70b5ec64
Merge pull request #23550 from swernli/execTTYFix
...
Fixing bug in AttachStreams that would fail to close StdIn
Upstream-commit: c1dd933c029d425ad8f5c3787d9b591ca216e08f
Component: engine
2016-06-17 11:19:28 -07:00
a4ed5a6eee
Update rmi logic for canonical references
...
Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion.
Canonical references with a different repository name will be treated as separate references.
Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a281be1c11d61deed7cb2853125e6d489f16aa2e
Component: engine
2016-06-17 10:15:56 -07:00
def8da9f42
Check if DriverState is valid before using in convert
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
2016-06-17 09:17:03 -07:00
b282e08783
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com >
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
2016-06-17 15:03:11 +01:00
79ea0079e7
Merge pull request #23644 from tonistiigi/fix-leave-delete
...
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
2016-06-17 01:40:45 +00:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
c0affdfcf8
Fixing bug in AttachStreams that would fail to close StdIn
...
During a docker exec, if no TTY is specified, the code would still leave stdin open instead of closing it. This change adds handling for the execConfig TTY bool that mirrors what is already done for container config. (Updated this change to be Windows only.)
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 176345435b33ecbb725cac995083fab0462f60e3
Component: engine
2016-06-16 17:34:45 -07:00
d903446499
fix "overlay" -> "overlay2" in error message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2d4b285a75621604f31058a43cb5ef1d4618533e
Component: engine
2016-06-16 16:42:40 -07:00
dae11af952
Fix removing containers on leaving from pending state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
2016-06-16 16:08:15 -07:00
10f6f936be
Return membership status on join without timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
2016-06-16 15:27:08 -07:00
f06a10b7f6
Merge pull request #23624 from coolljt0725/fix_restore_sandbox
...
check running again before restore active sandbox
Upstream-commit: 74c4834d32516761c56e3caceada1aa6bb6f8b86
Component: engine
2016-06-16 15:24:58 -07:00
8d1c8c8149
Merge pull request #23515 from HackToday/fixoverlay2
...
Add ecryptfs check for overlay2
Upstream-commit: 06da8ce28582417cd93d3242f1d895e46d4a204e
Component: engine
2016-06-16 15:12:09 -07:00
e79dde3c67
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
2016-06-16 15:06:27 -07:00
611e95b628
Merge pull request #23635 from sainath14/network_id_missing
...
Fixes #23596-returns empty string for NetworkID
Upstream-commit: 262081557b8ef9d4c0244170152fa9bee8962166
Component: engine
2016-06-16 14:38:51 -07:00
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -07:00
fc39b62384
Fixes #23596-returns empty string for NetworkID in response to /containers/json
...
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com >
Upstream-commit: ad85d299066e87cd40afc43ffee8cb73dcc79eb4
Component: engine
2016-06-16 12:34:00 -07:00
b088238272
Merge pull request #23609 from Microsoft/WindowsMemory
...
Windows: Re-enabled support for memory limit
Upstream-commit: 1f3efe67764b6f8616dd12271747863c17f36f30
Component: engine
2016-06-16 10:08:17 -07:00
d057888fb4
Fix restore active sandbox
...
we store the active sandbox after daemon.containerd.Restore, but there
is a chance the `Restore` will set the container to exit see
(https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469 ).
so we should check if the container is really running before add it to
activesandbox.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 78f3094518b1f3f498bd2629667877f9a87d452f
Component: engine
2016-06-16 07:54:36 -04:00
b58041b07a
use same hash for same secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a579ce8ed307024ededd527819bfdbf38e970fbf
Component: engine
2016-06-15 17:20:18 -07:00
66f02f955c
Windows: Added support for memory limit
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 12fe27a40893d92489996550ddff976eba50332c
Component: engine
2016-06-15 17:07:29 -07:00
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
