Commit Graph

1856 Commits

Author SHA1 Message Date
2f7fc91dd4 Merge pull request #27470 from runcom/expose-exec-pid
record pid of exec'd process
Upstream-commit: 13fd75c3dd18e6d57b6b28097fd7e0d0989c1b9e
Component: engine
2016-10-20 21:36:21 +02:00
0a853bdac1 Merge pull request #27556 from LK4D4/unify_install
project: unify way of installing runc and containerd
Upstream-commit: ffa0446e8b8a190cb42f6ff6d54acb8d65995e49
Component: engine
2016-10-20 10:13:40 -07:00
e50d97d8c8 project: unify way of installing runc and containerd
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
2016-10-20 08:50:02 -07:00
dd35c23542 record pid of exec'd process
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
2016-10-20 17:06:11 +02:00
774705a707 Merge pull request #27514 from crosbymichael/update-init-oct18
Update docker-init to 74341e923bdf06cfb6b70cf54089
Upstream-commit: a4125e2265ef8994e666af667e64b9a9a4133c73
Component: engine
2016-10-20 16:58:26 +02:00
5d48ce28d0 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors
Fix problems with wrapped errors in logrus
Upstream-commit: 9f30c28d2176b2822b7e66e4b0f462bb6a2cbe36
Component: engine
2016-10-19 10:16:01 -07:00
f7298ec9d2 Update sfp13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e4da146ecc726f9fb78553710e019edb4685d18
Component: engine
2016-10-18 17:17:22 -07:00
9fcbef44d7 Fix problems with wrapped errors in logrus
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:

- When printing to a terminal (colors enabled), stack traces are
  included in the error fields on a log line.

- When printing to a file (or with colors disabled), the error value is
  missing entirely.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 738131faae42760957abdaa5a64648ed481eee71
Component: engine
2016-10-18 17:14:59 -07:00
9aa2d11ea2 Update docker-init to 74341e923bdf06cfb6b70cf54089
Fixes a bug with background processes after the child process exits.

diff:
74341e923b

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3c3ba4cb662b0a19d5821470dd534279f18699fa
Component: engine
2016-10-18 14:45:43 -07:00
136f5c6e75 Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts
Update fluent-logger-golang to v1.2.1
Upstream-commit: 329f272fd55c9c9c335eef354ab4ec7b09a5c727
Component: engine
2016-10-18 12:47:13 -07:00
16e8ef0b4d cleaning up more stuff in vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
Upstream-commit: 2ce76c0696a603d8cca1433c6aa9b4325a711d53
Component: engine
2016-10-18 09:20:41 -02:00
f3b85d76fb Merge pull request #27471 from caarlos0/logentries
Added Logentries Driver
Upstream-commit: 24582e815330edd197337f17b1a0a541679f969b
Component: engine
2016-10-18 01:33:28 -07:00
7a03f51c60 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>
Upstream-commit: 53ed17449e990f49e8eecdf71ec3704ce7118660
Component: engine
2016-10-18 11:26:32 +09:00
23d87cfd7e Added logentries dependency to vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
Upstream-commit: 0f4db1cc59faddb0207db269fd660e8e1582b77a
Component: engine
2016-10-17 22:06:39 -02:00
58bc04a76a Bump vendored and dockerfile notary version to v0.4.2
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5f4dcd825299bf58e87e69c2bff3ceefc300a432
Component: engine
2016-10-14 17:52:56 -07:00
f54a7d0f94 Vendoring libnetwork @04025f2a2eebb
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9ae9f9812bc078523d64625793c079d99215cb63
Component: engine
2016-10-14 11:12:24 -07:00
1f94129ec0 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz
Make authz use pluginv2
Upstream-commit: 8658748ef716e43a5f6d834825d818012ed6e2c4
Component: engine
2016-10-13 00:28:43 +02:00
a97d7743a8 Vendor libnetwork.
This is primarily for plugingetter import path change.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 1845f506e4dad6916fd10564e2c8b0b18f43a7c9
Component: engine
2016-10-11 13:09:01 -07:00
60ebef1784 Merge pull request #27005 from lizzha/azurechina
Use the mirror in China for Azure China environment
Upstream-commit: 8d6e9f0c6ac6c77dee3b5a984c19c699660f7abb
Component: engine
2016-10-11 13:04:11 -07:00
9dfec63192 Merge pull request #26954 from mrjana/net
Vendoring libnetwork @7b74403
Upstream-commit: 5ff17cb4aae435715733c169fce21a3677cd21a7
Component: engine
2016-10-11 05:59:35 -07:00
2e79f0c54a Use the mirror in China for Azure China environment
Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Use the mirror in China for Azure China environment

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update option name to --mirror

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update indent and change variable name

Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Upstream-commit: 451979a368c0fcb7990bcce82122609a7b412428
Component: engine
2016-10-11 17:27:18 +08:00
70c250faf0 Windows: Update go-winio to 0.3.5
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 97ac469934051c5275d5130287d4a8eece84a412
Component: engine
2016-10-10 15:08:17 -07:00
21e065470e Vendoring libnetwork @7b74403be424
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 83ba14a55229c4e52293ef0877cadb2b83bb7f0b
Component: engine
2016-10-10 14:39:02 -07:00
ea330f084a Update grimes to 15ecf9414859b16a8a19ac6748a622a5498d57e3
This fixes an issue when wait4 returns a 0 return status causing the
reaping loop to continue to run.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c27116575e0d9b0d1eb085cffef0693babb7bdbb
Component: engine
2016-10-07 12:06:42 -07:00
21c16cc44b Merge pull request #27184 from tiborvass/gnupg-debian-stretch
install: fix debian stretch
Upstream-commit: 2fd674a00f98469caa1ceb572e5ae92a68b52f44
Component: engine
2016-10-06 14:20:03 -07:00
8f09fdc161 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>
Upstream-commit: 047264763adb3f61b1470b97e9fa20a4f1ddc83d
Component: engine
2016-10-06 22:23:08 +02:00
9ad2ffa17a Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
2016-10-06 19:36:31 +02:00
6e5d016ba6 Update containerd and runc
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7e12c3bb99381f117be73e05c187be6ce44280b9
Component: engine
2016-10-05 14:47:15 -07:00
02536572fb Revendor hcsshim to v0.5.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 267c04aa36a54260242a2cffbd19d4f25f782e94
Component: engine
2016-10-05 14:40:51 -07:00
3a03b98841 Merge pull request #26932 from dmcgowan/update-tar-split
Update tar split
Upstream-commit: 921a0bf686370587aec812a3a0efb002adf07614
Component: engine
2016-10-05 13:45:07 -07:00
391b6f94da Merge pull request #26509 from LK4D4/commits_from_vendor
project: move go binaries installation to separate script
Upstream-commit: 0b86ca9ad0916b62b7429f5d15821962bc4f7db0
Component: engine
2016-10-05 13:15:30 -07:00
c735d7ed2f Merge pull request #27038 from jstarks/non_base_utilityvm
Windows: support Windows servicing layers
Upstream-commit: 214b70e6ef9c5430c48cd88303f4cc0574e0037a
Component: engine
2016-10-05 10:02:31 -07:00
c99a6c9099 Merge pull request #26860 from anusha-ragunathan/nw-pv2
Make libnetwork use pluginv2.
Upstream-commit: 0cc7f0185f59f9271b7b783b776dac74347e8f51
Component: engine
2016-10-03 17:12:16 -07:00
6885c18aa4 Remove amd64 assumption in release.sh, cross and tgz scripts
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 61335bcb03ac60385bc19b6e1346b34cd168f7de
Component: engine
2016-10-03 15:46:42 -07:00
750c4cf157 Windows: Revendor hcsshim v0.4.5
This update adds support for non-base layers that have utility VM updates
and hard links. This is necessary to support Microsoft-released layers
with servicing updates.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: cab70c391f465905de2e2c5bd844c181c3c9a01b
Component: engine
2016-10-03 11:00:04 -07:00
a56e5f9c6c Vendor docker/swarmkit changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 009f74135123c785783349358d5ad69aa0992305
Component: engine
2016-10-03 10:59:38 -07:00
3b8c0feef0 Vendor in docker/libnetwork.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 2b0f0d0d711cf64233d984a02287c2167ce2d6c3
Component: engine
2016-10-03 10:40:05 -07:00
f44fc82a36 Merge pull request #26961 from Microsoft/jjh/oci
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
2016-09-30 10:13:57 -07:00
f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
2028ec4919 Revendor OCI runtime-spec 1c7c27d043c2
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba2df174935b5119f336e7f3ab5228cd41279791
Component: engine
2016-09-27 12:05:47 -07:00
ba7b4eb489 Update tar split
Pulls in fix for tar split disassembly incorrectly storing the padding
at the end of the file, leading to a hash difference on the
re-assembled tar archive.

Closes #26434

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: e3382177703989e6c29b1e5d8d3d800e033a617a
Component: engine
2016-09-27 09:57:56 -07:00
ada47b1174 Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8f4afb86eeb7f3f4a26eec51e4b843e1714f9f46
Component: engine
2016-09-26 23:48:16 -07:00
8a1347213b Bump remaining Dockerfile go versions to 1.7.1
These weren't updated with the switch to go1.7.1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
c7b9575ce1 Revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
This commit revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
to improve error message for removing pre-defined (e.g., `ingress`) network.

This commit is related to 24538.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f4e94617f087fc19614858fe496314673ad3877d
Component: engine
2016-09-24 12:14:04 -07:00
9b9def0b18 Vendoring libnetwork @bf3d9ccfb8e
Fixes certain node management issues when a daemon is restarted or fails
or leaves and joins a swarm.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: cd20621201d48f76b856d7d2404ee182e41e3492
Component: engine
2016-09-23 16:06:38 -07:00
75e7ddadb0 project: move go binaries installation to separate script
It should allow easier updates for containerd and runc

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1b41125ad9f1a3881b71bd044d76fd285170addb
Component: engine
2016-09-23 09:21:29 -07:00
1778a3ba1e Vendoring libnetwork @6caf9022fa09
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 746113d5840d064843a3d0b4c2cd68459b1d9415
Component: engine
2016-09-22 21:00:32 -07:00
956358039b Vendoring dependencies
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: 522930cfb3a9786d6c730e92068ea5b2656cabb0
Component: engine
2016-09-22 12:21:28 -07:00
6b6c0bf977 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
2016-09-22 09:39:27 +02:00
38db9ff302 Merge pull request #26770 from YuPengZTE/devEG
'eg.' should be 'e.g.'
Upstream-commit: a7b0b6e2a9360115e9bca719f6bdb6e9d8fc3415
Component: engine
2016-09-21 10:03:23 -04:00