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
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
2016-10-21 14:59:50 -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
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
2016-10-20 13:24:23 -07:00
Tonis Tiigi
16f11aef3c
Fix error reporting in CopyFileWithTar
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 57e12037ac
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
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
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
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
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
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
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
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
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
Kenfe-Mickael Laventure
5d04e28d9e
Remove amd64 assumption in release.sh, cross and tgz scripts
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 61335bcb03
2016-10-01 02:47:49 -07:00
alexchen
1767966502
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh
...
Signed-off-by: alexchen <alexchenunix@gmail.com>
(cherry picked from commit 4c74469d30
2016-10-01 02:15:25 -07:00
Vincent Demeester
5aa44019b0
Merge pull request #27077 from LK4D4/update_swarmkit
...
vendor: update swarmkit for 1.12.2
2016-10-01 10:39:54 +02:00
allencloud
180d122c5b
make remove network return 204
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit ea07ef7a7c
2016-09-30 22:49:20 -07:00
allencloud
9975fcbe1c
add lock in libcontainerd client AddProcess
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 278273bc16
2016-09-30 21:47:33 -07:00
Victor Vieux
1c0d9a4a90
Update date for 1.12.2-rc2
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-30 14:57:34 -07:00
Daniel Nephin
458bd3663b
Use ListOpt for labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 6c3b44f755
2016-09-30 14:56:13 -07:00
Justin Cormack
64ae81609c
Run seccomp tests in series not parallel
...
Fix #24803 as this had been failing sometimes.
As the parallel tests are probably genuine failures, and
had already been cut down, I will re-create these specifically
as a parallel execution test with no seccomp to make the
cause clearer.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 84ec04306c
2016-09-30 14:30:47 -07:00
Alexander Morozov
d29db3a55a
vendor: update swarmkit for 1.12.2
...
This includes:
docker/swarmkit#1588
docker/swarmkit#1592
docker/swarmkit#1594
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-30 14:18:45 -07:00
Sebastiaan van Stijn
0a6b4c2d9c
Merge pull request #27048 from thaJeztah/disable-api-1.25
...
[1.12.x] Hide API v1.25 docs
2016-09-29 23:33:35 +02:00
Sebastiaan van Stijn
d49c31e3c1
Hide API v1.25 docs
...
API v1.25 is for Docker 1.13. Commit
4da24ca1e3
2016-09-29 23:18:12 +02:00
Misty Stanley-Jones
3134c23b55
Merge pull request #27040 from mstanleyjones/fix_labels_nav_pick
...
Merge pull request #27036 from mstanleyjones/fix_labels_nav
2016-09-29 11:12:42 -07:00
Misty Stanley-Jones
a114655b56
Merge pull request #27036 from mstanleyjones/fix_labels_nav
...
Fix menu position of the labels-custom-metadata.md topic
(cherry picked from commit a3286783bc
2016-09-29 11:05:34 -07:00
Sebastiaan van Stijn
88ce3d60b9
Merge pull request #27032 from mstanleyjones/fix_image_link_pick
...
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
2016-09-29 19:27:49 +02:00
Sebastiaan van Stijn
ed69445474
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
...
Revert "Add direct link to event chart image"
(cherry picked from commit 6f07a4a69b
2016-09-29 10:23:10 -07:00
Sebastiaan van Stijn
cd15b2b300
Merge pull request #27022 from thaJeztah/docs-cherry-picks-1.12.2
...
Docs cherry picks 1.12.2
2016-09-29 17:58:12 +02:00
Misty Stanley-Jones
68aca71637
Fix link to non-existent file
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d76
2016-09-29 14:29:07 +02:00
Victoria Bialas
735622fdf4
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0a76a4cb5b
2016-09-29 14:29:00 +02:00
Sebastiaan van Stijn
ca474f7808
Fix incorrect aux-address examples and test
...
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.
Before this change, the example command
would send this API request;
{
"Attachable": false,
"CheckDuplicate": true,
"Driver": "overlay",
"EnableIPv6": false,
"IPAM": {
"Config": [
{
"Gateway": "192.168.0.100",
"IPRange": "192.168.1.0/24",
"Subnet": "192.168.0.0/16"
},
{
"AuxiliaryAddresses": {
"a": "192.170.1.5",
"b": "192.170.1.6"
},
"Gateway": "192.170.0.100",
"Subnet": "192.170.0.0/16"
}
],
"Driver": "default",
"Options": {
}
},
"Internal": false,
"Labels": {
},
"Name": "my-multihost-network",
"Options": {
}
}
After this change, the request looks
like this (all aux-addresses preserved);
{
"Attachable": false,
"CheckDuplicate": true,
"Driver": "overlay",
"EnableIPv6": false,
"IPAM": {
"Config": [
{
"AuxiliaryAddresses": {
"my-router": "192.168.1.5",
"my-switch": "192.168.1.6"
},
"Gateway": "192.168.0.100",
"IPRange": "192.168.1.0/24",
"Subnet": "192.168.0.0/16"
},
{
"AuxiliaryAddresses": {
"my-printer": "192.170.1.5",
"my-nas": "192.170.1.6"
},
"Gateway": "192.170.0.100",
"Subnet": "192.170.0.0/16"
}
],
"Driver": "default",
"Options": {
}
},
"Internal": false,
"Labels": {
},
"Name": "my-multihost-network",
"Options": {
}
}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb30
2016-09-29 14:28:52 +02:00
allencloud
c93303b8d7
move mcvlan out of experimental docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 6e4ec046f4
2016-09-29 14:28:35 +02:00
yuexiao-wang
96b5ec8f50
Fix the broken link
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit cfb07e642d
2016-09-29 14:28:29 +02:00
yuexiao-wang
394ce0c9c1
Fix typo for how pki works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit bf9c6d3115
2016-09-29 14:28:22 +02:00
lixiaobing10051267
729717568b
the network id is not consistant with the real id created
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 392aae44fd
2016-09-29 14:28:16 +02:00
