Commit Graph

30965 Commits

Author SHA1 Message Date
fd3b01be58 Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy
Set 0444 as default secret mode in stack deploy
Upstream-commit: a12454d7a964b99921adabdb8f741da5a94a0e66
Component: engine
2017-02-16 20:34:21 -05:00
6b0b33830b Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
Fix cpu spin waiting for log write events
Upstream-commit: 39851eac0c655d0c1911db58d4f630e2da233cac
Component: engine
2017-02-16 20:15:38 -05:00
33d38aa9ab Merge pull request #31091 from yongtang/02162017-swarmkit-update
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
Upstream-commit: 793c94fe440730310cbe88c33f8063418f426bb4
Component: engine
2017-02-16 17:12:00 -08:00
c531abbfb8 Merge pull request #31102 from vdemeester/add-yongtang-to-maintainers
Add Yong Tang to maintainers
Upstream-commit: 32b776d0d88c5f8b46a30bf7a73c964ad6d65519
Component: engine
2017-02-16 14:31:18 -08:00
36d38c8a19 Add Yong Tang to maintainers
This adds Yong Tang as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c7cf5fcf6c55b266c8166afb686ebd24ba8a34d8
Component: engine
2017-02-16 23:09:09 +01:00
679d4196b0 Merge pull request #31085 from vdemeester/sort-stack-ls
Sort `docker stack ls` by name
Upstream-commit: 3e53ecaaae0a6cebdfd6b734a7cb6ef47725a9b2
Component: engine
2017-02-16 14:23:48 -05:00
e2ff499d5e Merge pull request #29001 from darrenstahlmsft/WindowsOnLinux
Block pulling Windows images on non-Windows daemons
Upstream-commit: c31f73abfda14fa2fd75d8eb0a04221066a93dca
Component: engine
2017-02-16 19:57:54 +01:00
88bba1c7b5 Merge pull request #31002 from vdemeester/images-remove-handle-tag-digest
reference: handle combination of tag and digest in ImageDelete
Upstream-commit: bd81a16df0b236e874370059fff930badb7bba0d
Component: engine
2017-02-16 10:49:04 -08:00
cb4d6aeea8 Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0

The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291)
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608)
3. Global mode target replicas keep increasing (Issue #30854)
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938)
5. Define signals used to stop containers for updates (Issue #25696) (PR #30754)

This fix fixes #28291, #25608, #30854, #30938.
This fix is required by PR #30754.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ec860ca2526a65ec3b7059666b8e65bab9acf62c
Component: engine
2017-02-16 08:50:00 -08:00
19d262d100 Merge pull request #31054 from darrenstahlmsft/WaitOOBE
Windows: Wait for OOBE to prevent crashing during host update
Upstream-commit: 7f0b833621f61072d3176d224be02ea5089761f9
Component: engine
2017-02-16 11:18:25 -05:00
2f00829632 Merge pull request #31073 from aboch/naip
Release the network attachment on allocation failure
Upstream-commit: 55e2ed2a653f70c58206633710851ac75bc74e0b
Component: engine
2017-02-16 16:36:28 +01:00
ce49df485e Merge pull request #30746 from yongtang/29936-validate-insecure-registry
Validate insecure registry (`--insecure-registry`) values
Upstream-commit: 387ff3c41d0d5185b747e5ec4c9550376d3d4cca
Component: engine
2017-02-16 14:53:51 +01:00
492545a1db Sort docker stack ls by name
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 97d85127c231d1b0823a3459d638dbd4f0ba1460
Component: engine
2017-02-16 14:30:39 +01:00
6224d25ac6 Release the network attachment on allocation failure
- otherwise the attachment task will stay in store and
  consume IP addresses and there is no way to remove it.

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 91820b69412e2ec9e5b3201cd5c637ca1352fd39
Component: engine
2017-02-16 05:21:06 -08:00
2e425466b4 Merge pull request #31016 from aboch/vnd
Vendoring libnetowrk @5537cb4
Upstream-commit: 136e400a4c689262885b6f0c5843730d087e1483
Component: engine
2017-02-16 04:30:55 -08:00
55b4b2547e Set 0444 as default secret mode in stack deploy
Change the default secret mode to match the default one used in
`service` subcommands.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f2b68c6cc1664ca0c60457b8c713eec52902a2d2
Component: engine
2017-02-16 11:26:05 +01:00
348e71b4b8 reference: handle combination of tag and digest in ImageDelete
If you remove an image with digest+tag, it will fail because it wont
find it in the reference store (where digest+tag -> digest). Let's
make sure we do the same in ImageDelete, stripping the tag if
digest+tag are present.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0fbfeb17e5a135cfd40ea07ab64d6e6bcf903e44
Component: engine
2017-02-16 10:48:40 +01:00
ee71506629 Fix cpu spin waiting for log write events
This loop is not ever going to return since it's never actually setting
the `err` var except on the first iteration.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7a179972ff963706404f91671960b144dec98d65
Component: engine
2017-02-15 21:41:32 -05:00
323be4fac1 Merge pull request #31056 from tonistiigi/build-cache-fix
Reset stdin config before running build actions
Upstream-commit: d26cf30a6094c22fd9d5a032faf96103f6f841dc
Component: engine
2017-02-15 18:02:57 -05:00
7cb213f3ce Merge pull request #30416 from stevenh/linux-mount-fixes
Fix linux mount calls not applying propagation type changes
Upstream-commit: d52350d6623aa01bb846fc17ddbc209feafe1c14
Component: engine
2017-02-15 14:10:54 -08:00
d0f9d01ec6 Windows: Wait for OOBE to prevent crashing during host update
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: e128a65685dafd640e32118eb1903581489f7e31
Component: engine
2017-02-15 14:01:54 -08:00
2da555a6fc Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax
Make sure we validate simple syntax on service commands
Upstream-commit: f18bc25fa1449ececeac3f8e4691934bd07abb75
Component: engine
2017-02-15 12:31:46 -08:00
be4d0dc6ad Reset stdin config before running build actions
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0f293f9eb31bdf8ff7adcb31baafca3f6fde3aab
Component: engine
2017-02-15 11:49:17 -08:00
32586ce540 Merge pull request #28638 from yongtang/28626-improve-error-handling
Improve error handling of experimental features in non-experimental mode
Upstream-commit: abe6a073c72107d54187d3bba4385c49d343366d
Component: engine
2017-02-15 11:00:03 -08:00
ec803a2e58 Merge pull request #30303 from allencloud/rewrite-reload
refactor config reload in daemon
Upstream-commit: ee560bd748d50f48ae421169542d14c8ea6dceac
Component: engine
2017-02-15 09:40:55 -08:00
cebed3ff8d Merge pull request #29957 from ilianaw/amazonlinux-rpms
Build the docker-engine RPM for Amazon Linux
Upstream-commit: 3167bb8629a70728daaae3637ef9fa63273bb458
Component: engine
2017-02-15 09:40:03 -08:00
7ad266c66d Merge pull request #31040 from BSWANG/master
fix docker stack omit external volume's "nocopy" parameter
Upstream-commit: 07aaa718067baef4250466bb86ec2dc5601325dd
Component: engine
2017-02-15 09:35:07 -08:00
7f254e6829 Merge pull request #30861 from runcom/fix-plug-errcheck
plugin: check errors
Upstream-commit: ce0f9b5e10ca90687706a5168a6e251de4515fba
Component: engine
2017-02-15 07:50:27 -08:00
e7f7c8cfe0 Fix linux mount calls not applying propagation type changes
Propagation type changes must be done as a separate call, in the
same way as read only bind mounts.

To fix this:
1. Ensure propagation type change flags aren't included in other calls.
2. Apply propagation type change in a separate call.

Also:
* Make it clear which parameters are ignored by passing them as empty.
* Add tests to ensure Mount options are applied correctly.

Fixes #30415

Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk>
Upstream-commit: b3b14b97b1087bfbce6a4de7039e17847fe491a2
Component: engine
2017-02-15 14:15:09 +00:00
3128024c49 rewrite reload code
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 75f5d63ec8414eb3d5f0a0707225b6fa7d485ce7
Component: engine
2017-02-15 21:57:27 +08:00
cf83a0af42 Merge pull request #30922 from dperny/fix-log-error-handling-return-error
Fix both logs commands to correctly handle errors
Upstream-commit: 946787e85e7c747c78354c5ca8d7a512b8766969
Component: engine
2017-02-15 08:41:42 -05:00
7ea1feeeaf Merge pull request #30971 from dargor/allow_sync_file_range2
Allow sync_file_range2 on supported architectures.
Upstream-commit: 3b5ed562fc2b9a65b86a67dc88a9e44e95d7814c
Component: engine
2017-02-15 13:00:50 +00:00
a3ebb4bd61 fix docker stack volume's nocopy parameter
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
Upstream-commit: 4fe611958cc7d44a2a9d95ab892340349ed02072
Component: engine
2017-02-15 19:46:27 +08:00
b3755e4629 Merge pull request #31029 from BSWANG/master
fix docker daemon reload bug
Upstream-commit: ed003ffbe5b1f73af937c26ad106aab9da5148b9
Component: engine
2017-02-15 10:06:18 +01:00
5880452d53 Merge pull request #30832 from allencloud/update-swaggeryml-on-cluster-status-code
remove 400 and 404 for get nodes endpoint and add 503 for secret update
Upstream-commit: e8b92f154d68d17a09fa62ef8cd1b72163887c58
Component: engine
2017-02-15 09:45:44 +01:00
734f174687 plugin: check errors
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3716dd227231046d4303f289bd31b9dde8168b26
Component: engine
2017-02-15 09:35:36 +01:00
347c5e8518 fix docker daemon reload bug
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
Upstream-commit: 51870c7e920cef10ecb19a8d8662bcf32da4b7c5
Component: engine
2017-02-15 10:58:09 +08:00
2315da980a Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
Update plugin_volume apidocs for v2
Upstream-commit: 3dc87714d1bfcaf0620fabec3bfea89620b59337
Component: engine
2017-02-14 15:27:04 -08:00
f9c823322f fix docker logs error handling
Previously, `docker logs` (and by extension, `docker service logs`) had
an error in the way they returned errors that occurred after a stream
had already been started. Specifically, the errors were added verbatim
to the HTTP response, which caused StdCopy to fail with an esoteric
error. This change updates StdCopy to accept errors from the source
stream and then return those errors when copying to the destination
stream.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: f19b0d72d1234c2bf4d85f7c1a4916b7b85b97b0
Component: engine
2017-02-14 14:38:42 -08:00
98a3d66460 Validate insecure registry (--insecure-registry) values
This fix is based on:
https://github.com/docker/docker/issues/29936#issuecomment-277494885

Currently the insecure registry is only checked to see if it contains
scheme (`http(s)://`) or not. No fully validation is done and this
caused many confusions like in #29936.

This fix tries to address the issue.

This fix adds additional validation so that an insecure registry
is validated to make sure it is in `host:port` format where host
could be IPv4/IPv6 or a host name, and port could be an integer
between 0-65535.

Additional unit tests have been added.

This fix is related to #29936.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e49589505a9c543006f9a54a85917c3349b6ec5a
Component: engine
2017-02-14 13:13:23 -08:00
9e811ad5ef Merge pull request #30921 from anusha-ragunathan/debug_docs
Add plugin socket related debug docs.
Upstream-commit: fddab1444f2c2f7e240a4bde10971ed84967767b
Component: engine
2017-02-14 13:10:23 -08:00
bfe4fc0207 Merge pull request #30873 from albers/completion-fix-start--checkpoint
Fix bash completion for `start --checkpoint`
Upstream-commit: e70227e6d20d7fa464eb2eaa1e6a760d641d6874
Component: engine
2017-02-14 16:00:15 -05:00
38136418f8 Merge pull request #30941 from sdurrheimer/zsh-completion-service-logs
Add zsh completion for 'docker service logs' command
Upstream-commit: 03db46362e5d913d5162e255ea5cff3d1fa73266
Component: engine
2017-02-14 15:59:19 -05:00
59db936767 Merge pull request #30943 from sdurrheimer/zsh-completion-checkpoint
Add zsh completion for 'docker checkpoint' commands
Upstream-commit: 4f6e4bfd0259331a840cdf06157389fce24f9457
Component: engine
2017-02-14 15:58:45 -05:00
8178464bb3 Merge pull request #30945 from sdurrheimer/zsh-completion-plugin
Add zsh completion for missing 'docker plugin' commands and options
Upstream-commit: da9a162301e36b7aa9a4925657f8c28121b11125
Component: engine
2017-02-14 15:57:25 -05:00
70ee4eca4e Merge pull request #30952 from yongtang/02122017-swagger-attachable
Add `attachable` for network object in swagger api docs
Upstream-commit: 0464441fb152564f90340d4806b77ca7821aa1ef
Component: engine
2017-02-14 15:53:52 -05:00
4fb9ed21cb Allow sync_file_range2 on supported architectures.
Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com>
Upstream-commit: 52d8f582c331e35f7b841171a1c22e2d9bbfd0b8
Component: engine
2017-02-14 21:29:33 +01:00
06c085bc74 Add plugin socket related debug docs.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 6b8ae528655f65403c4d75d4bd9ce576cd26ff82
Component: engine
2017-02-14 12:13:48 -08:00
c619dbfa25 Vendoring libnetowrk @5537cb4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5b6048fd6302550904e60e371c8aabaf6af346b1
Component: engine
2017-02-14 11:52:57 -08:00
d39118ab1f Merge pull request #29702 from WeiZhang555/stats-all-format-name-panic
Send "Name" and "ID" when stating stopped containers
Upstream-commit: 22472c8be50ca0ddaf8207d46c6a9f5e792bd0af
Component: engine
2017-02-14 10:48:42 -08:00