Commit Graph

100 Commits

Author SHA1 Message Date
d6425cf5ab Merge pull request #13482 from boucher/criu-libcontainer-update
Update vendored libcontainer
Upstream-commit: 6d8e517bce90866abcf311cd5cc079ad8cce2a86
Component: engine
2015-05-29 10:28:58 -07:00
9218287317 Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d429465b37b29f72109e373379580f020d3ff9ee
Component: engine
2015-05-28 00:04:01 +00:00
9181b59d85 Update vendored libcontainer to v2.1
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
Upstream-commit: 4509f91b26869500dd0d7ea6858e03b1b00eef5d
Component: engine
2015-05-26 12:47:57 -07:00
2f63354a90 Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
2015-05-23 18:42:34 -07:00
6fda96cea6 Fix network connectivity problem for non-root users
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
2015-05-20 17:51:20 +00:00
769fee3fba Vendoring in libnetwork, netns, netlink
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 272f8cd4bc537bd78e7bf02d5b06fac50afda8ff
Component: engine
2015-05-19 22:40:18 +00:00
2d55f07e06 kr/pty: vendor upstream 5cf931ef8f
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 478d86a5f5046165c0e34612eb5983630830e93f
Component: engine
2015-05-15 15:22:16 +08:00
eaedb9b85a Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
2015-05-13 13:55:26 -07:00
1d7b0aaa0c Fix mangled hack/vendor.sh rebase
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c2d618781183817e74245325add5bddebcb810d2
Component: engine
2015-05-13 12:52:59 -06:00
5a91f639c0 Merge pull request #9411 from Mic92/features/zfs-rebased
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
aaee340d81 Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
It adds List function for listing all supported caps

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5a2d592c27e93cf7f3d01216cf6e22656330fe84
Component: engine
2015-05-08 09:22:37 -07:00
e5820ed7e4 Implement Docker on ZFS
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
2015-05-08 17:48:20 +02:00
2e6e1769a6 Update "hack/vendor.sh" to be more explicit
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic.  This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).

We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b919dee8347a47763d576136254bcbc922ef4c57
Component: engine
2015-05-07 17:43:11 -06:00
f61181dd2f Update libcontainer to 1b471834b45063b61e0aedefbb1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2f54c1a352e23de04a4535d0fc1bd0cad66c7c15
Component: engine
2015-05-07 14:43:39 -07:00
fccc1b566d Update libcontainer and make it the source of truth on logrus version
To help avoid version mismatches between libcontainer and Docker, this updates libcontainer to be the source of truth for which version of logrus the project is using.  This should help avoid potential incompatibilities in the future, too. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 80a895142e7101b44ff71910bb2da994b1cc4f5f
Component: engine
2015-05-04 11:02:44 -06:00
1232de25e5 Merge pull request #12944 from tianon/fsnotify-1.2.0
Update fsnotify to 1.2.0
Upstream-commit: 56f7da34fc0161d2ccbbd2eeb3473ac5f406e0e1
Component: engine
2015-05-04 16:57:45 +03:00
84315243cc Update fsnotify to 1.2.0
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: e1ccfabdc5c3163db05327d24c4b2581eeac752c
Component: engine
2015-05-02 23:28:15 -06:00
ba5fba5a8d Update go-patricia to 2.1.0
This includes a fix for the minor v2 API change introduced by 341a37095f. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b447fef7ecb740bc0f9ece75e10926fc5f121b5c
Component: engine
2015-05-02 23:25:57 -06:00
7bd38d02c2 Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
IT'S ABOUT TIME. 🎉

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 576985a1dcd76a9af2c5c483e6f12035a1f47b96
Component: engine
2015-05-01 16:01:10 -06:00
36fe7b2098 Add gocheck to vendored deps
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6dcdf832a3dddc8de17b7f8b1fb1ddb8b20f9077
Component: engine
2015-04-21 10:28:52 -07:00
f10bd173bd Merge pull request #11478 from dmcgowan/v2-vendored-api
Use v2 api from distribution
Upstream-commit: 563041b5c4acaca8e6ebb8fb4e81a3e7e7c37e81
Component: engine
2015-04-10 17:22:38 -04:00
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
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
b6e329b9fe Vendor distribution v2 api
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f011d722ce2ec7ef00654130f7f4ff8d295f025f
Component: engine
2015-03-31 14:58:45 -07:00
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
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
a2c5155c6a Merge pull request #11758 from crosbymichael/update-libct-mar25
Update libcontainer to a6044b701c166fe538fc760f9e2
Upstream-commit: 3d9cbf0e7176e8aa5d4078cd00a400e1dcc5169d
Component: engine
2015-03-25 12:17:33 -07:00
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
d4497c7a2b .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
abd71318ca Revert "Dealing with trailing whitespaces"
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
d00e59a1a0 Merge pull request #10681 from noironetworks/whitespaces-cleaner
Removed all trailing whitespaces from every text file
Upstream-commit: 322095ed63ec0943378485f8f8d4cabcfd471875
Component: engine
2015-03-24 16:02:14 -07:00
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
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
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
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
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
a64392e089 Dealing with trailing whitespaces
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 4e65c1c319afffc325853b88c9aef0c42ec83482
Component: engine
2015-03-17 03:34:01 +00:00
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
719f00fbf2 Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
e8e8b5b2cb Move 'hack' to the less confusing 'project'
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 32e61b8f5c3f855f5e204064be1aea6a877dda43
Component: engine
2014-11-09 21:50:28 +00:00
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
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
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
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
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
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
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
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
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
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