1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

85 Commits

Author SHA1 Message Date
Alexander Morozov
9f318dd3e8 Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
Fix #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2f853b94931057d8ebcd6e21f7656d3a04e2acf4
Component: engine
2015-04-07 15:10:44 -07:00
Michael Crosby
54f3509eb1 Update libcontainaer to d00b8369852285d6a830a8d3b9
Fixes #12015

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
Michael Crosby
477d0f5d83 Update libcontainer to c8512754166539461fd860451ff
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 17ecbcf8ff051575928a6e9fb13be0b034b3090d
Component: engine
2015-03-30 16:29:10 -07:00
Tiffany Low
7fd0208ff7 Upgrade logrus to v0.7.2
- Daemon logs now report to millisecond resolution

Signed-off-by: Tiffany Low <the.second.angel@gmail.com>
Upstream-commit: 711e580320a5da5cb33e8f03a17d355b4fb127c1
Component: engine
2015-03-30 12:27:03 -07:00
Michael Crosby
645e076e86 Update libcontainer to a6044b701c166fe538fc760f9e2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b4196f7892f4aeb11318bbd6c2d68227868e27e2
Component: engine
2015-03-25 11:32:14 -07:00
Michael Crosby
fa9aab1c43 Update libcontainer to fd0087d3acdc4c5865de1829d4a
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e321ec980708b052fd788b41af97f875630cda9c
Component: engine
2015-03-23 14:14:20 -07:00
Simon Eskildsen
c88ab1e8ac vendor: update logrus to 0.7.1
Changes relevant for Docker since 0.6.6 are (most other changes are hooks and
options for formatters):

* Debugging color output changed to gray.
* Don't quote the number 9 when it's by it self (i.e. `omg=9` instead of
  `omg="8"`, this was the case for all other numbers)
* Performance is better when running a high logging level with lots of low-level
  logging.
* Minor internal refactoring and more tests.

Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
Upstream-commit: 3a33bff7fdd96705e761bb1f1750cfa6f4df4070
Component: engine
2015-03-22 02:06:50 +00:00
Mrunal Patel
67dd189d62 Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 60ef4ae6fcb015546a646eb3b613344a9c4fc27b
Component: engine
2015-03-19 14:42:23 -04:00
unclejack
eec8373c1c Revert "correct comment errors for netlink_linux.go"
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: d173669fdff8ec1acc33d2da28e2a473a3844e56
Component: engine
2015-03-19 14:38:00 +02:00
s00318865
d2b7fa6417 correct comment errors for netlink_linux.go
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: c5fdc93f89db3cb3ea4489999296487fad0f440d
Component: engine
2015-03-19 20:29:30 +08:00
Stephen J Day
b16d50a307 Correctly close pipe after error in tarsum verification
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
2015-03-18 19:07:55 -07:00
Derek McGowan
bda242c975 Vendor distribution/digest
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 75e29f4550027f02aa0c61ceeb53315c9f627571
Component: engine
2015-03-17 10:47:45 -07:00
Michael Crosby
7a404617a3 Merge pull request #11402 from miminar/err-cleanup
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
2015-03-16 16:13:16 -07:00
Mrunal Patel
ca91611c4f Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
It includes fixes to selinux Getfilecon, mounting sysfs and cgroups.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 591f821aee9e1d59ec3c619e15344c90047463d6
Component: engine
2015-03-16 18:13:40 -04:00
Michal Minar
c29e43cc4b Format error by value
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 210ab030bc3dab7bcf8f7252f2f9facb5a26cb6b
Component: engine
2015-03-16 12:05:53 +01:00
Alexander Morozov
08d67abfd9 Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
It includes new Type() method for Factory, which needed for replacing
execdriver.Driver.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: eade8eac09ad8cfdaf762e88d382daf6017201d7
Component: engine
2015-03-13 11:33:49 -07:00
Michael Crosby
282d3dadfd Merge pull request #11331 from jfrazelle/update-logrus
Update logrus to 0.6.6
Upstream-commit: 5494432f917eb0f6e4cf73deed366f6830ec64ec
Component: engine
2015-03-11 16:18:22 -07:00
Michael Crosby
447782f74b Update libcontainer to aa10040b570386c1ae311c6245b
Includes mqueue label fix and cgroups improvements.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c553be5a4f3ff24079337e2ffe2437325f9969e1
Component: engine
2015-03-11 11:49:15 -07:00
Jessica Frazelle
e4aa3231a3 Update logrus to 0.6.6
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 89e2e5fc55620634df3f2c9403594b0f701b0c5c
Component: engine
2015-03-11 11:29:13 -07:00
Alexander Morozov
657cb570cc update libcontainer to dd3cb8822352fd4acc0b8b426bd86e47e98f6853
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 7910cb52435f6edbd30444114d12d9bfaa34b37c
Component: engine
2015-03-06 11:25:55 -08:00
Alexander Morozov
c036119857 Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
This revision is from docker_1.5 branch, because we don't want to
introduce user namespace in docker 1.5, but fix for --pid=host is
needed.

Fixes #10303

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: fd2d45d7d465fe02f159f21389b92164dbb433d3
Component: engine
2015-01-26 14:00:44 -08:00
Michael Crosby
6a9f109b4d Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6b04d9342c3d76f5979850f93a4afd41afa33227
Component: engine
2015-01-19 10:37:31 -08:00
Arnaud Porterie
f0e21e0f5c Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
Correct exit code when dying on a signal (fixes #9979).

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 009041cdfd815c0ab49493f9f5757b171ee8c987
Component: engine
2015-01-12 18:12:59 -08:00
Michael Crosby
c9c0b0be61 Update libcontainer to 6460fd79667466d2d9ec03f77f3
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 115d8bac6017cc5703fe34e679f1a30a4759a9ff
Component: engine
2015-01-12 10:38:15 -08:00
Alexander Morozov
8404235dd8 Merge pull request #9648 from estesp/9202-update-resolvconf
Update container resolv.conf when host network changes /etc/resolv.conf
Upstream-commit: 92af1f014520b4f75a6220478b01ed6a02ca5bfb
Component: engine
2015-01-08 14:06:55 -08:00
Michael Crosby
dd96c3c9fc Update libcontainer to be02944484da197166020d6b3f0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 16dbd84f6386519dbbcefeb81cdfa708bca8cfa8
Component: engine
2015-01-08 10:29:24 -08:00
Alexandr Morozov
f89df3eb6f Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
This fixes wrong behavior of mutating methods of Namespaces object

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: c98ae1f88fccd89eb2184cd2b780f9827ad5ad41
Component: engine
2014-12-26 21:03:48 -08:00
Tianon Gravi
33fd7533fb Add github.com/go-fsnotify/fsnotify
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Upstream-commit: edbf1ed68085171649dd0118e2f6755e7037894c
Component: engine
2014-12-23 18:17:39 -05:00
Alexander Morozov
c77458bef6 Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 50905a6d6ce2fdd1ab0c33ec0b7a26895e0cbeea
Component: engine
2014-12-23 12:10:03 -08:00
unclejack
401a4f9dcd kr/pty: vendor upstream 05017fcccf
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2524c0c5555f9127b4cd3d326430617f72979bab
Component: engine
2014-12-17 23:23:24 +02:00
Michael Crosby
7f73c7a751 Update libcontainer to 53eca435e63db58b06cf796d3a9
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 269b37503e00f86b9215bc6fe27c502cf4d90072
Component: engine
2014-12-03 14:53:11 -08:00
Michael Crosby
2a4e189795 Update libcontainer to 84c1636580a356db88b079d118b
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f42176434aa874afb7d633064f2babcf9d5124ab
Component: engine
2014-11-20 14:19:24 -08:00
Tibor Vass
fa056c1bc9 Merge pull request #9201 from vieux/add_hostname_docker_info
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
Victor Vieux
4b4f9725e6 Update libtrust version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
2014-11-20 17:39:54 +00:00
Michael Crosby
a531c55832 Update libcontainer to 28cb5f9dfd6f3352c610a4f1502
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 975fa5487ca531374fed421b52de1adf133c9810
Component: engine
2014-11-17 12:16:37 -08:00
Aleksa Sarai
da278331e0 vendor: update vendor'd libcontainer version
This patch updates the vendor'd libcontainer version, so that Docker can
take advantage of the updates to the `user` API.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: a10cca257f678e5e3c866b3c35f77877fe4789d2
Component: engine
2014-11-08 09:57:20 +11:00
Michael Crosby
a1e154d1fe Update libcontainer to fd6df76562137aa3b18e44b790c
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7f5ebdcaac51a3a0cf3805397748154d3743469c
Component: engine
2014-11-06 01:12:41 +00:00
Doug Davis
d09ed90b9d Update logrus to v0.6.0 so we can use ParseLevel() for PR #8335
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a12d89739412dc9fa9f961e0e4a310ec5a53bd74
Component: engine
2014-11-03 11:57:30 -08:00
Michael Crosby
5243fb8cd6 Update libcontainer f60d7b9195f8dc0b5d343abbc3293d
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 622e1005530eada61675e533d3993d7df6c21186
Component: engine
2014-10-28 22:19:01 +00:00
Alexandr Morozov
7fa7b2fbdb Vendor logrus logging framework
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6229a364324ba603789bc38607bb628177280ebf
Component: engine
2014-10-24 15:01:52 -07:00
Michael Crosby
2fe580eb85 Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 291b84610fc87622c7116ac71328c1ce3181a6db
Component: engine
2014-10-23 19:00:05 +00:00
Michael Crosby
39417f76ad Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
This fixes issues where the apparmor profile is not applied to processes
via docker exec.  As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.

Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels

- in another shell
docker exec <name> sleep 1000

- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 018ce19b31bbd8d752658835e9442fa7d59a47e3
Component: engine
2014-10-14 06:24:38 +00:00
Michael Crosby
b3ff7a5ede Update libcontainer to 4f409628d80b9842004a3f17c92
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8fedf718ce0c788311d8d3382b0aaeb9b9a792d4
Component: engine
2014-10-13 19:53:20 +00:00
Michael Crosby
9b0677b8de Merge pull request #8320 from dmcgowan/provenance_pull
Official image provenance pull flow
Upstream-commit: eaaf9e31258ca0af042e07c707f6bbb3afeb293b
Component: engine
2014-10-03 10:56:54 -07:00
Michael Crosby
824c8d6309 Update libconatiner to b3570267c7b7995d5d618974d8f
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 193654e3ef26067315d6c68c3066215e5c509ae5
Component: engine
2014-10-02 22:19:56 +00:00
Derek McGowan
8635bae7b0 Update libtrust version
Updated to version of libtrust with the trust graph implementation

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8a6c7100ea7f6ea82ba567863b6401f45766625b
Component: engine
2014-10-01 13:19:40 -07:00
Tianon Gravi
b79cf494d2 Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
Upstream-commit: 07179a7eb1a0cb7816b618a108d46cb4a4e699ca
Component: engine
2014-09-29 18:09:25 -06:00
Michael Crosby
9ea819ca0c Update libcontainer to c744f6470e37be5ce1f1ae09b84
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 392eec20751bd1da7f84fa4974042eaa263a56d2
Component: engine
2014-09-29 21:23:42 +00:00
Derek McGowan
82830cd901 Vendor libtrust
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a049ac32d1850e9bc5b16640a859b1709bc4af62
Component: engine
2014-09-26 15:48:12 -07:00
Michael Crosby
fee8abc42e Update libcontainer to 185328a42654f6dc9a41814e578
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2531fba389c8bd25ed1ec7bea38f0ee19c974a26
Component: engine
2014-09-19 11:21:44 -07:00