Antonio Murdaca
44ccbb317c
*: fix logrus.Warn[f]
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-06-11 19:42:38 +02:00
Sebastiaan van Stijn
2a6abf1011
Merge pull request #23441 from thaJeztah/update-packagers
...
Update Golang requirements in PACKAGERS.md
2016-06-11 15:26:45 +02:00
Sebastiaan van Stijn
edadc2f4d7
Update Golang requirements in PACKAGERS.md
...
Docker 1.12 now requires Go 1.6, so update
the packagers.md accordingly
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-11 01:47:51 +02:00
Alexander Morozov
ee8c512dc3
Merge pull request #23403 from WeiZhang555/split-utils
...
Move GetExitCode to package container and unexport it
2016-06-10 15:38:06 -07:00
Michael Crosby
3d0595f1d5
Merge pull request #23439 from michael-holzheu/PR-s390x-seccomp-remove-again
...
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
2016-06-10 14:45:44 -07:00
Sebastiaan van Stijn
29283143be
Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen
...
[carry 23352] update peaceful zen
2016-06-10 23:23:16 +02:00
Sebastiaan van Stijn
a1f60b9db3
Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout
...
(cherry-pick) Increase containerd start-timeout to 2 minutes on master
2016-06-10 23:21:52 +02:00
Michael Holzheu
e6e51d37f7
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
...
We have to wait until runc version (RUNC_COMMIT) is bumped.
Otherwise we get the following error:
oci runtime error: string SCMP_ARCH_S390 is not a valid
arch for seccomp
Fixes: bf2a577c13 ("Enable seccomp for s390x")
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
2016-06-10 15:18:58 -04:00
Alexander Morozov
12970bef34
Merge pull request #23351 from thaJeztah/remove-go-1.4-fix
...
remove fallback for Go 1.4
2016-06-10 09:16:46 -07:00
fortinux
cd7ca2a1c7
update peaceful zen
...
Signed-off-by: fortinux <info@fortinux.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-10 16:39:05 +02:00
Vincent Demeester
73169da9db
Merge pull request #23433 from thaJeztah/changelog-cherry-pick
...
Cherry-pick 1.11.2 CHANGELOG into master
2016-06-10 16:28:19 +02:00
Kenfe-Mickael Laventure
64a91ee74e
Increase containerd start-timeout to 2 minutes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit 4251e1e99e16ff7ff5557ee16e5bef26a14cd127)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-10 16:22:19 +02:00
Kenfe-Mickael Laventure
302a1e6101
Update CHANGELOG for 1.11.2
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit c9dd46ca5c4d559e079962fe583755828f4b1a03)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-10 16:16:10 +02:00
Sebastiaan van Stijn
4a3b9a606b
Merge pull request #23410 from cyphar/fix-xattr-ignore
...
pkg: archive: only ignore ENOTSUP when xattr fails
2016-06-10 15:58:25 +02:00
Antonio Murdaca
a05536ff42
Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra
...
Use spf13/cobra for docker load and save
2016-06-10 12:02:18 +02:00
Vincent Demeester
51f0def774
Merge pull request #23400 from runcom/fix-digest-test
...
integration-cli: use distribution/reference.DigestRegexp
2016-06-10 11:56:14 +02:00
Sebastiaan van Stijn
04f5ce5152
Merge pull request #23421 from tiffanyfj/typos
...
Fixed spelling error in builder/dockerfile/parser/parser.go
2016-06-10 08:31:19 +02:00
Sebastiaan van Stijn
949f8d0d11
Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin
...
docs: Add Azure File Storage Volume Driver plugin
2016-06-10 00:36:13 +02:00
Ahmet Alp Balkan
b91269c5ed
docs: Add Azure File Storage Volume Driver plugin
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2016-06-09 15:28:38 -07:00
Sebastiaan van Stijn
a4ff707e99
Merge pull request #23406 from thaJeztah/update-deb-script
...
release-deb: create "dists" directory if missing
2016-06-10 00:05:43 +02:00
Sebastiaan van Stijn
1164f917fa
Merge pull request #23359 from londoncalling/docker-engine-overview
...
re-doing Docker Engine overview topics for v.1.12
2016-06-10 00:02:56 +02:00
Tiffany Jernigan
a07c57f656
Fixed spelling error in builder/dockerfile/parser/parser.go
...
Signed-off-by: Tiffany Jernigan <tiffany.f.j@gmail.com >
2016-06-09 14:49:59 -07:00
John Howard
30bbf184e9
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
2016-06-09 11:39:39 -07:00
Alexander Morozov
5bdc833e44
Merge pull request #23413 from vdemeester/client-fix-context-sharing
...
Fix some api/client context sharing/plumbing
2016-06-09 10:15:10 -07:00
Vincent Demeester
075b75fa14
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 >
2016-06-09 17:58:10 +02:00
Vincent Demeester
6632fd2788
Migrate save command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-06-09 17:38:20 +02:00
Vincent Demeester
8b1d40271f
Migrate load command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-06-09 17:28:33 +02:00
Aleksa Sarai
e6d856df43
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 >
2016-06-10 00:56:40 +10:00
Vincent Demeester
63a7a59c92
Merge pull request #23408 from absourdnoise/fix-docs-readme-link
...
Fixing man page link in docs/README.md
2016-06-09 15:59:48 +02:00
Andrew Po
55e9976316
Fixing man page link
...
Signed-off-by: Andrew Po <absourd.noise@gmail.com >
2016-06-09 16:39:50 +03:00
Sebastiaan van Stijn
94ac03cdf5
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 >
2016-06-09 15:22:49 +02:00
Sebastiaan van Stijn
b8f3cdfaec
Merge pull request #23402 from michael-holzheu/PR-bump-libseccomp-golang
...
Bump seccomp version to enable ppc/s390x seccomp support
2016-06-09 14:15:03 +02:00
Sebastiaan van Stijn
266c40087c
Merge pull request #23398 from jfrazelle/23394-butts
...
fix default tmpfs size to prevent breakage
2016-06-09 14:08:58 +02:00
Zhang Wei
c111b7eb3d
Move GetExitCode to package container and unexport it
...
GetExitCode is used only by container package, so move it to package
container and unexport it
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-06-09 18:04:53 +08:00
Michael Holzheu
758f9a8ceb
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
2016-06-09 05:48:06 -04:00
Antonio Murdaca
0bc88d5b0a
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 >
2016-06-09 11:11:08 +02:00
Jess Frazelle
982c5f199f
fix default tmpfs size to prevent breakage
...
Signed-off-by: Jess Frazelle <me@jessfraz.com >
2016-06-09 00:58:06 -07:00
Vincent Demeester
456551a672
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
2016-06-09 08:14:14 +02:00
Victoria Bialas
8bd33b430b
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 >
2016-06-08 17:35:28 -07:00
Darren Stahl
bb1c54bc1f
Revendor hcsshim to v0.3.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-06-08 17:32:22 -07:00
Sebastiaan van Stijn
6717b35503
Merge pull request #23385 from thaJeztah/fix-rpm-manpages
...
fix RPM spec for man8
2016-06-09 01:04:02 +02:00
Sebastiaan van Stijn
b47bf3dc69
Merge pull request #23387 from thaJeztah/fix-TestEventsContainerWithMultiNetwork
...
fix TestEventsContainerWithMultiNetwork
2016-06-09 01:03:17 +02:00
Sebastiaan van Stijn
5b1060c775
Merge pull request #23354 from riyazdf/notary-delegation-env
...
Add link to notary environment vars from docker trust automation section
2016-06-09 00:09:28 +02:00
Vincent Demeester
e884a515e9
Merge pull request #23334 from WeiZhang555/cobra-stats
...
Migrate stats and events command to cobra
2016-06-08 23:50:46 +02:00
Vincent Demeester
8a22c4166b
Merge pull request #23384 from jannickfahlbusch/fix-typos
...
Fix some typos
2016-06-08 23:46:47 +02:00
Sebastiaan van Stijn
7d22eb072c
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 148bcda329
(pull request 23375), exposing this test to be
flaky.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-08 23:09:20 +02:00
Brian Goff
6fd8c96f61
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
2016-06-08 16:37:08 -04:00
Sebastiaan van Stijn
70a03951a0
fix RPM spec for man8
...
installation for man-8 was added in 1514b499f0
(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 >
2016-06-08 22:21:21 +02:00
Jannick Fahlbusch
e3490cdcc0
Fix some typos
...
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de >
2016-06-08 21:59:34 +02:00
Alexander Morozov
3b08711bb7
Merge pull request #23343 from vdemeester/migrate-build-to-cobra
...
Use spf13/cobra for docker build
2016-06-08 11:59:48 -07:00