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

25893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron Lehmann
020915ca30 Vendor swarmkit 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-01 16:39:14 -08: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
Jean-Christophe Berthon
72875b0d01 builder: Add AppArmor to runc buildtags for armhf 
On Raspbian and Debian Jessie for ARMv7 (aka armhf), the builtags for runc
were missing. These buildtags should include 'apparmor' and 'selinux'.

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
(cherry picked from commit e0c7300e3b)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:36:29 -07:00
Satoshi Tagomori
659509e40b Update fluent-logger-golang to v1.2.1 
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
(cherry picked from commit 53ed17449e)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-20 11:36:10 -07:00
Victor Vieux
30a4d7e3db Merge pull request #27554 from aaronlehmann/vendor-swarmkit-1.12.3 
Vendor swarmkit for 1.12.3
 2016-10-20 11:23:11 -07:00
Alessandro Boch
882e8d5d75 Vendoring libnetwork for 1.12.3 
- It includes few fixes which prevent a
  deadlock, a panic, a couple of races,
  and a regression.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-10-19 13:01:50 -07:00
Aaron Lehmann
109b53d882 Vendor swarmkit for 1.12.3 
This updates swarmkit to include a few important bug fixes, including
some fixes for regressions.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-19 10:23:27 -07:00
Victor Vieux
bb80604a0b Bump VERSION to v1.12.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-11 05:23:52 +00:00
Kenfe-Mickaël Laventure
91d8560fc0 Merge pull request #27216 from andrewhsu/add-missing-changelog 
add changelog lines for swarmkit and libnetwork
 2016-10-10 07:32:00 -07:00
Andrew Hsu
feb59d32d7 add changelog lines for swarmkit and libnetwork 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-10-07 13:10:44 -07:00
Victor Vieux
cb0ca64a34 Bump VERSION to v1.12.2-rc3 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-06 21:27:01 +00:00
Victor Vieux
841c5f9166 update changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-06 14:26:27 -07:00
Tibor Vass
026f385aa3 install: fix debian stretch 
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 047264763a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-06 14:24:36 -07:00
Victor Vieux
1863675001 Merge pull request #27196 from mlaventure/update-containerd-1.12.x 
[1.12.2] Update containerd and runc
 2016-10-06 11:46:20 -07:00
Kenfe-Mickael Laventure
3377b4b9b7 Update containerd and runc 
containerd: 0366d7e9693c930cf18c0f50cc16acec064e96c5
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-06 09:28:08 -07:00
Brian Goff
d82e3bf952 Merge pull request #27180 from aboch/c1.12.x 
Vendoring libnetwork & swarmkit to address #27147
 2016-10-06 15:50:53 +02:00
Alessandro Boch
cb58783630 Vendoring libnetwork & swarmkit to address #27147 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-10-05 21:16:04 -07:00
Victor Vieux
d72629e18f add awscli to arm Dockerfile 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit dbec45fa7a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-04 18:46:58 -07:00
Victor Vieux
ad9538afc2 Bump VERSION to v1.12.2-rc2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-04 05:37:23 +00:00
Victor Vieux
545d909aac Merge pull request #27079 from vieux/cherry-picks-and-changelog-1.12.2 
Cherry-picks and Changelog 1.12.2-rc2
 2016-10-03 22:34:24 -07:00
Victor Vieux
0e7c6b8496 Merge pull request #27120 from mavenugo/vin_ln 
Vendoring libnetwork 9fc9609b
 2016-10-03 15:42:24 -07:00
Madhu Venugopal
d11648696f Vendoring libnetwork 9fc9609b 
Cherry-picking fix for #27109

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-10-03 12:09:45 -07:00