Commit Graph

23233 Commits

Author SHA1 Message Date
df727cdb81 update peaceful zen
Signed-off-by: fortinux <info@fortinux.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd7ca2a1c761886ba937efef2ea5fbd90d371c1b
Component: engine
2016-06-10 16:39:05 +02:00
35f940a3e5 Merge pull request #23410 from cyphar/fix-xattr-ignore
pkg: archive: only ignore ENOTSUP when xattr fails
Upstream-commit: 4a3b9a606b0a33de8148a1fd438bd2166fa77945
Component: engine
2016-06-10 15:58:25 +02:00
6975ac43d7 Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra
Use spf13/cobra for docker load and save
Upstream-commit: a05536ff42d8a59d72cd95dfc38dc848e736420c
Component: engine
2016-06-10 12:02:18 +02:00
40058a9c4e Merge pull request #23400 from runcom/fix-digest-test
integration-cli: use distribution/reference.DigestRegexp
Upstream-commit: 51f0def774fc8e526adce73bb4465577ebebfe27
Component: engine
2016-06-10 11:56:14 +02:00
95e43c122a Merge pull request #23421 from tiffanyfj/typos
Fixed spelling error in builder/dockerfile/parser/parser.go
Upstream-commit: 04f5ce5152dbbe303e95216fb5a2a420656c3297
Component: engine
2016-06-10 08:31:19 +02:00
610cddde7b Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin
docs: Add Azure File Storage Volume Driver plugin
Upstream-commit: 949f8d0d11eb7dbc2fbdf91210c5564da19de8e7
Component: engine
2016-06-10 00:36:13 +02:00
988a32ccaf docs: Add Azure File Storage Volume Driver plugin
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b91269c5edf0b62bcc91d18b23b58e66f7a4f52b
Component: engine
2016-06-09 15:28:38 -07:00
44f55e1d1d Merge pull request #23406 from thaJeztah/update-deb-script
release-deb: create "dists" directory if missing
Upstream-commit: a4ff707e993ac01c05eee5dd9e7eb7d374d129cf
Component: engine
2016-06-10 00:05:43 +02:00
a68e300e2a Merge pull request #23359 from londoncalling/docker-engine-overview
re-doing Docker Engine overview topics for v.1.12
Upstream-commit: 1164f917faa46e0178dd5050a524a635ea849386
Component: engine
2016-06-10 00:02:56 +02:00
394bb94714 Fixed spelling error in builder/dockerfile/parser/parser.go
Signed-off-by: Tiffany Jernigan <tiffany.f.j@gmail.com>
Upstream-commit: a07c57f656846ee0de67ac4f575fe5b76d482efb
Component: engine
2016-06-09 14:49:59 -07:00
7f639864bd Merge pull request #23392 from Microsoft/RevendorHcsshim
Revendor hcsshim to v0.3.2
Upstream-commit: 30bbf184e937ee2aab075a4a6890d9f9f0b74cde
Component: engine
2016-06-09 11:39:39 -07:00
cde498e147 Fix some context sharing/plumbing
With cobra switch (and maybe before), some context weren't *plumbed* the
right way, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 075b75fa14e878afa87ad4fd989f03a8541b13eb
Component: engine
2016-06-09 17:58:10 +02:00
50d0524958 Migrate save command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6632fd27881faf899bbc33a8219a84ff18443270
Component: engine
2016-06-09 17:38:20 +02:00
7c6917a358 Migrate load command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8b1d40271fd2abcd6b703a2d9e6036bceb01c050
Component: engine
2016-06-09 17:28:33 +02:00
a37552bd58 pkg: archive: only ignore ENOTSUP when xattr fails
There might be other (valid) reasons for setxattr(2) to fail, so only
ignore it when it's a not supported error (ENOTSUP). Otherwise, bail.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: e6d856df43ac2877ebbcff26e9f3ee755f52bce9
Component: engine
2016-06-10 00:56:40 +10:00
c88ebc1c56 Fixing man page link
Signed-off-by: Andrew Po <absourd.noise@gmail.com>
Upstream-commit: 55e99763160018c610718890468c0f7ef300b1d9
Component: engine
2016-06-09 16:39:50 +03:00
6ca123dd75 release-deb: create "dists" directory if missing
The script failed if an empty volume is used
to generate the repo. This adds the directory
if missing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 94ac03cdf549567c01f191a066d8435731f41e06
Component: engine
2016-06-09 15:22:49 +02:00
9e8cade78a Merge pull request #23402 from michael-holzheu/PR-bump-libseccomp-golang
Bump seccomp version to enable ppc/s390x seccomp support
Upstream-commit: b8f3cdfaec28ed4113b30923452a9842312ba70f
Component: engine
2016-06-09 14:15:03 +02:00
83ade3a267 Merge pull request #23398 from jfrazelle/23394-butts
fix default tmpfs size to prevent breakage
Upstream-commit: 266c40087cbdd80b93e435284264db5f881a03e1
Component: engine
2016-06-09 14:08:58 +02:00
fd09c4f818 Bump seccomp version to enable ppc/s390x seccomp support
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 758f9a8cebbc3f6a0f07cd66146c726452b4207d
Component: engine
2016-06-09 05:48:06 -04:00
f06234ccc6 integration-cli: use distribution/reference.DigestRegexp
from a docker push output digest.DigestRegexp.FindString(output) does
not retrive the sha256: prefixed digest but just a string - in many
cases it's the registry host. The checks in the code are completely
wrong then. Fix this by using the DigestRegexp from the
distribution/reference package which correctly retrieves the digest
from the output.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 0bc88d5b0a14e6c7291bb5fbf99283a05511d07c
Component: engine
2016-06-09 11:11:08 +02:00
19a918ce43 fix default tmpfs size to prevent breakage
Signed-off-by: Jess Frazelle <me@jessfraz.com>
Upstream-commit: 982c5f199fe548ecafd53ab72e7984a6ce07ba8f
Component: engine
2016-06-09 00:58:06 -07:00
7b699065ec Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
Update win2lin scripts to match production
Upstream-commit: 456551a672db7285dfdba9927c1acb8d2ab07a6b
Component: engine
2016-06-09 08:14:14 +02:00
abee2dc945 re-doing Docker Engine overview topics for v.1.12
fixed broken links created from Engine Overview update by adding missing topic to daemon reference page and updating the hrefs in the api pages

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 8bd33b430b950ca5355f950d4b79a04ba0363c3c
Component: engine
2016-06-08 17:35:28 -07:00
99c133c055 Revendor hcsshim to v0.3.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: bb1c54bc1f0379b03eac50949c4b1fba0f91dd57
Component: engine
2016-06-08 17:32:22 -07:00
0cfb313091 Merge pull request #23385 from thaJeztah/fix-rpm-manpages
fix RPM spec for man8
Upstream-commit: 6717b355034e81659cd8144590eaa7ac8c573fba
Component: engine
2016-06-09 01:04:02 +02:00
5d76988d40 Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork
fix TestEventsContainerWithMultiNetwork
Upstream-commit: b47bf3dc696615308d021b6ef417a9147d7b065c
Component: engine
2016-06-09 01:03:17 +02:00
c7bd96a413 Merge pull request #23354 from riyazdf/notary-delegation-env
Add link to notary environment vars from docker trust automation section
Upstream-commit: 5b1060c7758aa6bfd2210515a3e24fb287322ed9
Component: engine
2016-06-09 00:09:28 +02:00
6828e7721d Merge pull request #23334 from WeiZhang555/cobra-stats
Migrate stats and events command to cobra
Upstream-commit: e884a515e96201d4027a6c9c1b4fa884fc2d21a3
Component: engine
2016-06-08 23:50:46 +02:00
abc5e5e918 Merge pull request #23384 from jannickfahlbusch/fix-typos
Fix some typos
Upstream-commit: 8a22c4166b3f82f4ae447a89541e8b691a3bddda
Component: engine
2016-06-08 23:46:47 +02:00
7eea5a2dd4 fix TestEventsContainerWithMultiNetwork
the order in which disconnect takes place is undetermined,
so don't check for the full name

this test was passing due to a previous bug, that
always returned the same network-name.

this bug was recently fixed in 148bcda3292563df8e433a3d7987810cd5702dec
(pull request 23375), exposing this test to be
flaky.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7d22eb072cd277048e678d6244e5fb395b34f1ff
Component: engine
2016-06-08 23:09:20 +02:00
ecac3fcd79 Merge pull request #23344 from pdalpra/timeout-as-time.Duration
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
2016-06-08 16:37:08 -04:00
2c68dc49b6 fix RPM spec for man8
installation for man-8 was added in 1514b499f04e317d6bc81bb2d46a6623db422763
(pull-request 23236), but had a typo in a path,
causing generation of the RPM's to fail.

This fixes the path

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 70a03951a037c2c415d84fc65eff989151c1dfc4
Component: engine
2016-06-08 22:21:21 +02:00
79ea898035 Fix some typos
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
Upstream-commit: e3490cdcc0e2b1e4c4da125626430016a3048128
Component: engine
2016-06-08 21:59:34 +02:00
6c2f2ddb74 Merge pull request #23343 from vdemeester/migrate-build-to-cobra
Use spf13/cobra for docker build
Upstream-commit: 3b08711bb75e30d850665312413a60f51114202f
Component: engine
2016-06-08 11:59:48 -07:00
f6287067bc Merge pull request #23381 from kolyshkin/docs-add-ploop-plugin
docs/extend/plugins.md: add docker-volume-ploop
Upstream-commit: f8a8222126806391f78a87cf327dd69353488c3c
Component: engine
2016-06-08 20:39:37 +02:00
9194f25b8a docs/extend/plugins.md: add docker-volume-ploop
Added docker-volume-ploop driver to the list of available volume plugins.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: e3d31d794b64d93174e17dd98249033e623adbe6
Component: engine
2016-06-08 11:24:56 -07:00
74d1f25f8f Merge pull request #23002 from Microsoft/jjh/readonly
Windows: Support RO volumes 14350+
Upstream-commit: 393e97e435e7c1629934d8042d1fb8e5bb7d61f9
Component: engine
2016-06-08 11:18:48 -07:00
ef59715b3a Update win2lin scripts to match production
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9ea3f2aca2ce3b12d42e72290e404592209ee652
Component: engine
2016-06-08 11:08:23 -07:00
41181cb2ee Merge pull request #23377 from vdemeester/carry-pr-23007
Carry #23007 :  Say something useful during docker load
Upstream-commit: 9db33b7646854ed994b74d0e71bced087e617291
Component: engine
2016-06-08 13:42:22 -04:00
a9c87bb7fb Merge pull request #23375 from HackToday/fixnetworkmap
Fix wrong map usage
Upstream-commit: 148bcda3292563df8e433a3d7987810cd5702dec
Component: engine
2016-06-08 18:19:08 +02:00
5988d92124 Update docker-load documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9b5e0ea7dedac3c1cbbaf6770aa6834c8e7b7774
Component: engine
2016-06-08 17:40:37 +02:00
1f1966583b Merge pull request #23305 from thaJeztah/fix-network-examples
network docs cleanup
Upstream-commit: 430950e2d17c25b5df65d61a53f50528510509ac
Component: engine
2016-06-08 17:32:00 +02:00
a3be33ddb5 Say something useful during docker load
During a `docker load` there are times when nothing is printed
to the screen, leaving the user with no idea whether something happened.
When something *is* printed, often its just something like:
```
1834950e52ce: Loading layer 1.311 MB/1.311 MB
5f70bf18a086: Loading layer 1.024 kB/1.024 kB
```
which isn't necessarily the same as the image IDs.

This PR will either show:
- all of the tags for the image, or
- all of the image IDs if there are no tags

Sample output:
```
$ docker load -i busybox.tar
Loaded image: busybox:latest

$ docker load -i a.tar
Loaded image ID: sha256:47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb
```

IOW, show the human-friendly stuff first and then only if there are no tags
default back to the image IDs, so they have something to work with.

For me this this is needed because I have lots of images and after a
recent `docker load` I had no idea what image I just imported and had a
hard time figuring it out.  This should fix that by telling the user
which images they just imported.

I'll add tests once there's agreement that we want this change.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6986a3220fe59146eeddeaa865561472abc7baeb
Component: engine
2016-06-08 17:17:05 +02:00
9eb8ea5219 Fix wrong map usage
As map reference, if all networks use same, it could cause strange
results.
Closes: #23304
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 1cac7e6cbd3d1501d0fc29fc55b7ada981974998
Component: engine
2016-06-08 14:36:47 +00:00
1a51605407 Support unicode characters in parseWords
Signed-off-by: Jonathan Stoppani <jonathan.stoppani@divio.com>
Upstream-commit: 6284f04a6b3a9b8127dc166ff84b102c8ad411ce
Component: engine
2016-06-08 14:05:08 +02:00
4a159b3745 Merge pull request #22880 from bfirsh/remote-api-json-errors
Return remote API errors as JSON
Upstream-commit: a4422e6ebc57c2c1082bc23a9906e948acbb0da7
Component: engine
2016-06-08 11:16:00 +02:00
2193b7f2c7 Use time.Duration for container restart/stop timeouts
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
Upstream-commit: b29e8ea412534a857d76bc716b79c7483e347f3a
Component: engine
2016-06-08 08:05:18 +02:00
81dc24449c Migrate stats and events command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 04cdb8e6025d9c0eac0462f3ad3f1ab33204e615
Component: engine
2016-06-08 10:39:53 +08:00
5b4a1181e1 Merge pull request #21946 from chosenken/add_disk_quota_to_zfs
Add support for setting storage size on ZFS containers
Upstream-commit: d85491ff4bd300b159425dcad41764f454f43ceb
Component: engine
2016-06-07 22:18:25 -04:00