Commit graph

30989 commits

Author SHA1 Message Date
Vincent Demeester
f85ee17810
Convert request.SockRequestRaw to appropriate methods
`request.SockRequestRaw` is deprecated, let's use appropriate methods
for those. This is a first pass, `SockRequest` still needs to be removed.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 17:12:30 +01:00
Vincent Demeester
40532143c2 Merge pull request #30848 from nishanttotla/suppress-digest-docker-ps
Suppressing image digest in docker ps
2017-02-17 10:27:49 +01:00
Vincent Demeester
0ac25dfc75 Merge pull request #29742 from miaoyq/rewrite-validate-privileges
Rewrite the function 'validatePrivileges' without checking order
2017-02-17 10:24:11 +01:00
Vincent Demeester
146bc072a9 Merge pull request #31069 from tonistiigi/fix-overlay2-unmount
overlay2: fix unmounting layer without merge dir
2017-02-17 10:21:47 +01:00
Vincent Demeester
d07cd8c321 Merge pull request #29894 from cpuguy83/cleanup_volumedriver_retry_test
Use vol plugin creator instead of inserting spec
2017-02-17 09:46:31 +01:00
Vincent Demeester
e1839ab953 Merge pull request #31103 from tonistiigi/update-docs-link
Update storage driver options link
2017-02-17 09:45:31 +01:00
Brian Goff
a2106c8224 Merge pull request #30809 from fate-grand-order/branch
Correct fmt.Fprintf and t.Fatalf
2017-02-16 23:02:03 -05:00
Brian Goff
8e57694452 Merge pull request #31088 from xulike666/make-code-readable-again
Typo fixed and this time I provide my cSpell.json
2017-02-16 22:04:27 -05:00
Tonis Tiigi
e9864cc0ec Update storage driver options link
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-16 18:32:17 -08:00
Brian Goff
623612fe09 Merge pull request #30679 from mlaventure/cgroup-devices-docs
Add example for --device-cgroup-rule to create reference
2017-02-16 21:18:04 -05:00
Brian Goff
7978eef623 Merge pull request #30618 from cpuguy83/fix_data_races
Fix some data races
2017-02-16 21:15:21 -05:00
Sebastiaan van Stijn
88de5c36c7 Merge pull request #31023 from mstanleyjones/fix_liquid_errors
Fix some Liquid errors
2017-02-16 18:13:15 -08:00
Nishant Totla
b04536f61f
Suppressing image digest in docker ps
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-02-16 18:11:56 -08:00
Brian Goff
e412e33a2f Merge pull request #30946 from sdurrheimer/zsh-completion-log-opts
Add zsh completion for docker log options 'max-buffer-size|mode'
2017-02-16 20:51:31 -05:00
Brian Goff
a12454d7a9 Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy
Set 0444 as default secret mode in stack deploy
2017-02-16 20:34:21 -05:00
Brian Goff
39851eac0c Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
Fix cpu spin waiting for log write events
2017-02-16 20:15:38 -05:00
Aaron Lehmann
793c94fe44 Merge pull request #31091 from yongtang/02162017-swarmkit-update
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
2017-02-16 17:12:00 -08:00
Tibor Vass
32b776d0d8 Merge pull request #31102 from vdemeester/add-yongtang-to-maintainers
Add Yong Tang to maintainers
2017-02-16 14:31:18 -08:00
Vincent Demeester
c7cf5fcf6c
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>
2017-02-16 23:09:09 +01:00
Daniel Nephin
3e53ecaaae Merge pull request #31085 from vdemeester/sort-stack-ls
Sort `docker stack ls` by name
2017-02-16 14:23:48 -05:00
Vincent Demeester
c31f73abfd Merge pull request #29001 from darrenstahlmsft/WindowsOnLinux
Block pulling Windows images on non-Windows daemons
2017-02-16 19:57:54 +01:00
Tõnis Tiigi
bd81a16df0 Merge pull request #31002 from vdemeester/images-remove-handle-tag-digest
reference: handle combination of tag and digest in ImageDelete
2017-02-16 10:49:04 -08:00
Yong Tang
ec860ca252 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>
2017-02-16 08:50:00 -08:00
Aaron.L.Xu
f8a4047796 why there are so many mistakes in our repo (up to /cmd)
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-02-17 00:32:48 +08:00
Brian Goff
7f0b833621 Merge pull request #31054 from darrenstahlmsft/WaitOOBE
Windows: Wait for OOBE to prevent crashing during host update
2017-02-16 11:18:25 -05:00
Vincent Demeester
55e2ed2a65 Merge pull request #31073 from aboch/naip
Release the network attachment on allocation failure
2017-02-16 16:36:28 +01:00
Vincent Demeester
387ff3c41d Merge pull request #30746 from yongtang/29936-validate-insecure-registry
Validate insecure registry (`--insecure-registry`) values
2017-02-16 14:53:51 +01:00
Vincent Demeester
97d85127c2
Sort docker stack ls by name
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-16 14:30:39 +01:00
Alessandro Boch
91820b6941 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>
2017-02-16 05:21:06 -08:00
Madhu Venugopal
136e400a4c Merge pull request #31016 from aboch/vnd
Vendoring libnetowrk @5537cb4
2017-02-16 04:30:55 -08:00
Vincent Demeester
f2b68c6cc1
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>
2017-02-16 11:26:05 +01:00
Vincent Demeester
0fbfeb17e5
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>
2017-02-16 10:48:40 +01:00
Brian Goff
7a179972ff 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>
2017-02-15 21:41:32 -05:00
Tonis Tiigi
e1af6c8a57 overlay2: fix unmounting layer without merge dir
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-15 17:58:12 -08:00
Brian Goff
d26cf30a60 Merge pull request #31056 from tonistiigi/build-cache-fix
Reset stdin config before running build actions
2017-02-15 18:02:57 -05:00
Alexander Morozov
d52350d662 Merge pull request #30416 from stevenh/linux-mount-fixes
Fix linux mount calls not applying propagation type changes
2017-02-15 14:10:54 -08:00
Darren Stahl
e128a65685 Windows: Wait for OOBE to prevent crashing during host update
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-02-15 14:01:54 -08:00
Alexander Morozov
f18bc25fa1 Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax
Make sure we validate simple syntax on service commands
2017-02-15 12:31:46 -08:00
Tonis Tiigi
0f293f9eb3 Reset stdin config before running build actions
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-15 11:49:17 -08:00
Alexander Morozov
abe6a073c7 Merge pull request #28638 from yongtang/28626-improve-error-handling
Improve error handling of experimental features in non-experimental mode
2017-02-15 11:00:03 -08:00
Victor Vieux
ee560bd748 Merge pull request #30303 from allencloud/rewrite-reload
refactor config reload in daemon
2017-02-15 09:40:55 -08:00
Victor Vieux
3167bb8629 Merge pull request #29957 from ilianaw/amazonlinux-rpms
Build the docker-engine RPM for Amazon Linux
2017-02-15 09:40:03 -08:00
Victor Vieux
07aaa71806 Merge pull request #31040 from BSWANG/master
fix docker stack omit external volume's "nocopy" parameter
2017-02-15 09:35:07 -08:00
Anusha Ragunathan
ce0f9b5e10 Merge pull request #30861 from runcom/fix-plug-errcheck
plugin: check errors
2017-02-15 07:50:27 -08:00
Steven Hartland
b3b14b97b1 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>
2017-02-15 14:15:09 +00:00
allencloud
75f5d63ec8 rewrite reload code
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-15 21:57:27 +08:00
Brian Goff
946787e85e Merge pull request #30922 from dperny/fix-log-error-handling-return-error
Fix both logs commands to correctly handle errors
2017-02-15 08:41:42 -05:00
Justin Cormack
3b5ed562fc Merge pull request #30971 from dargor/allow_sync_file_range2
Allow sync_file_range2 on supported architectures.
2017-02-15 13:00:50 +00:00
bingshen.wbs
4fe611958c fix docker stack volume's nocopy parameter
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2017-02-15 19:46:27 +08:00
Vincent Demeester
ed003ffbe5 Merge pull request #31029 from BSWANG/master
fix docker daemon reload bug
2017-02-15 10:06:18 +01:00