beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25963 commits 14 branches 412 tags 338 MiB
Commit graph

25963 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
a751f94ca0 Small log formatting fixes 
… and clise to close 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2f7e907846)
 2016-12-02 18:10:25 -08:00
Tonis Tiigi
a2a983c770 Don’t warn on missing fifo 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit ee9d28bd3f)
 2016-12-02 18:10:25 -08:00
Tonis Tiigi
06092267aa vendor: update fifo to fe870ccf2 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-12-02 18:10:16 -08:00
Tonis Tiigi
1e69caad8c Fix logging formatting 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit aa01ee4ac5)
 2016-12-02 18:09:13 -08:00
Tonis Tiigi
e136d3ef93 Move stdio attach from libcontainerd backend to callback 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 37a3be2449)
 2016-12-02 18:09:10 -08:00
Tonis Tiigi
7e98d12157 Refactor stdin closing 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6f2658fb8c)
 2016-12-02 18:09:06 -08:00
Alexander Morozov
c17155fbc3 libcontainerd: attach streams before create 
Fix #26371

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 02d1934279)
 2016-12-02 18:09:00 -08:00
Tonis Tiigi
6781d1912d Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6d26464502)
 2016-12-02 18:08:57 -08:00
Victor Vieux
0c3e2e1556 Merge pull request #29089 from vieux/fix_plugin_tests 
[1.12.x] "fix" plugin tests
 2016-12-02 16:57:41 -08:00
Victor Vieux
f25e197379 Merge pull request #29004 from aboch/c1.12.x 
[1.12.x] Porting libnetwork fixes
 2016-12-02 16:28:26 -08:00
Derek McGowan
50841b16fe
Ensure opaque directory permissions respected 
When converting an opaque directory always keep the original
directory tar entry to ensure directory is created with correct
permissions on restore.

Closes #27298

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-12-02 16:16:59 -08:00
Victor Vieux
6756f1d160 Merge pull request #29047 from aaronlehmann/vendor-1.12-swarmkit 
[1.12.x] Vendor swarmkit
 2016-12-02 15:26:48 -08:00
Victor Vieux
f90c1625e9 Merge pull request #28990 from vdemeester/28985-dont-validate-hostname-on-1_12 
[1.12.x] Remove hostname validation as it seems to break users
 2016-12-02 15:10:59 -08:00
Victor Vieux
c54e23e38a Merge pull request #29050 from cpuguy83/1.12.4-cherrypicks 
[1.12.x] backport 2 fixes
 2016-12-02 15:10:30 -08:00
Victor Vieux
e3034309b3 "fix" plugin tests in 1.12.x 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-12-02 15:00:59 -08:00
Dan Walsh
403c9b9676 We need to relabel newly created container volumes 
This will add a label to any volume that is shared into a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
(cherry picked from commit 5a277c8a4a)
 2016-12-01 21:41:46 -05:00
Darren Stahl
7e902398f9 Stop holding container lock while waiting on streams 
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 07cd19655b)
 2016-12-01 21:40:04 -05:00
Aaron Lehmann
020915ca30 Vendor swarmkit 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-01 16:39:14 -08:00
Tom Denham
76d2f1f29b Update tests to handle bug fix from libnetwork 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-30 16:16:34 -08:00
Alessandro Boch
d619f3d669 Porting libnetwork fixes to 1.12.x 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-30 14:40:39 -08:00
Vincent Demeester
bfd123b2a9
Remove hostname validation as it seems to break users 
Validation is still done by swarmkit on the service side.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-30 19:21:28 +01:00
Vincent Demeester
d77269a802 Merge pull request #28652 from gjtempleton/Fix-Inspect-docs 
Add missing quote mark and fix grammar in inspect docs
 2016-11-21 11:02:21 +01:00
GuyTempleton
1d7418f212 Add missing quote mark and fix grammar in inspect docs 
Signed-off-by: GuyTempleton <Guy.Templeton@skyscanner.net>
 2016-11-21 09:10:28 +00:00
Misty Stanley-Jones
6a0ce4924f Merge pull request #28262 from mstanleyjones/more_metadata_fixes 
Change metadata for plugin ref docs and deprecation doc
 2016-11-10 13:50:34 -08:00
Misty Stanley-Jones
438d8fa3db Change metadata for plugin ref docs and deprecation doc 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-10 13:49:13 -08:00
Misty Stanley-Jones
5025b97c1d Merge pull request #28174 from mstanleyjones/112x_metadata_change 
Formatting changes to make 1.12.x ref docs buildable in Jekyll
 2016-11-09 13:55:06 -08:00
Misty Stanley-Jones
cf60af87f9 Formatting changes to make 1.12.x ref docs buildable in Jekyll 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-09 13:07:24 -08:00
Victor Vieux
6b644ecc19 Bump VERSION to v1.12.3 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-26 10:48:43 -07:00
Sebastiaan van Stijn
bad4d1299e Merge pull request #27704 from andrewhsu/fix-changelog 
added date to version number in changelog
 2016-10-24 17:13:21 -07:00
Andrew Hsu
e64bf8c3cd added date to version number in changelog 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-10-24 17:00:02 -07:00
Victor Vieux
ebe2e9cf85 update CHANGELOG.md 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 21:18:23 -07:00
Michael Crosby
ca151de73c Merge pull request #27693 from mlaventure/update-containerd-fix-json-compat 
Update containerd to b818e749726ba18e430bb825396c85408dfaf2a4
 2016-10-24 13:29:24 -07:00
Kenfe-Mickael Laventure
ec98dcb56d Update containerd to b818e749726ba18e430bb825396c85408dfaf2a4 
This add backward compatibility with the event logs format prior to
1.12.2.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-24 11:33:26 -07:00
Victor Vieux
a154321efc Bump VERSION to v1.12.3-rc1 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 18:13:30 -07:00
Victor Vieux
190a96131c Merge pull request #27634 from justincormack/user-cap-test 
Test that non root user cannot use default capabilities
 2016-10-24 01:26:02 -07:00
Victor Vieux
c5ac1fcc29 Merge pull request #27611 from vieux/changelog-1.12.3 
1.12.3 Changelog
 2016-10-24 01:24:56 -07:00
Justin Cormack
5c0c9e4587 Test that non root user cannot use default capabilities 
Test for #27590

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-22 12:18:43 +01:00
Victor Vieux
548f8f0895 1.12.3 Changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 17:15:59 -07:00
Victor Vieux
d1a1b9692a Merge pull request #27595 from vieux/cherry-picks-1.12.3 
cherry-picks 1.12.3
 2016-10-21 16:59:01 -07:00
Tonis Tiigi
a8ffa0128c chroot: remount everything as private in new mntns 
If parent of the destination path is shared, this
path will be unmounted from the parent ns even if
the path itself is private.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit b511d1f0ca)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 14:59:58 -07:00
Tonis Tiigi
3f21a28ec0 chroot: let root be cleaned up by kernel 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 70dfea63ba)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 14:59:50 -07:00
Victor Vieux
ed879071ec Merge pull request #27610 from crosbymichael/update-runc 
Bump runc to f59ba3cdd76fdc08c004f42aa915996f6f420899
 2016-10-21 14:23:43 -07:00
Michael Crosby
d60a3418d0 Bump runc to f59ba3cdd76fdc08c004f42aa915996f6f420899 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-10-21 12:49:30 -07:00
Kay Yan
3b9269760c Fix conversion of restart-policy from GRPC 
restart-condition for services from "on_failure" to "on-failure".

Since GRPC does not support dashes in properties, this change
added a conversion when _setting_ the restart-condition.

However, when inspecting a service, no conversion took place
from the internal GRPC value, resulting in "on_failure" to
be shown.

This change updates the conversion to fix this, and removes
a "hack" that was previously used for this, now using a
Switch to compare to actual types.

Before this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on_failure","MaxAttempts":0}

Afer this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on-failure","MaxAttempts":0}

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
(cherry picked from commit bc32fcabeb)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 13:24:32 -07:00
allencloud
defb41068c add \n in engine labels display in docker node inspect xxx --pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit ddec4c3ee4)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 13:24:23 -07:00
Victor Vieux
8bc5f43b14 Merge pull request #27559 from aboch/c1.12.x 
Vendoring libnetwork for 1.12.3
 2016-10-20 12:06:27 -07:00
Tonis Tiigi
16f11aef3c Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 57e12037ac)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:38:58 -07:00
allencloud
7ae3379a64 add lock in libcontainerd client AddProcess of Windows 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 5143be0ccf)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:38:36 -07:00
Felix Ruess
1552aa3d9a builder: update deb armhf ubuntu-trusty buildtags 
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
(cherry picked from commit 63515bc59e)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:37:01 -07:00
Thomas Leonard
351799f4f0 Reset health status to starting when a container is restarted 
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
(cherry picked from commit b8793cff48)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:36:43 -07:00