Steve Durrheimer
419dbccd3a
Add zsh completion for 'docker events --filter' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b5498a8b0b6d836b42381bbdd272670ad3219bd2
Component: engine
2016-06-11 17:02:26 +02:00
Steve Durrheimer
3a227e412a
Add zsh completion for 'docker ps --filter=network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 60c435e7d0f79f530606dd49440fbdef6d83edd2
Component: engine
2016-06-11 16:53:26 +02:00
Steve Durrheimer
68b8d0d9c0
Add zsh completion for 'docker {create,run} --pid' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 654aaa055e3bc56048996f46e4e4b6d0afe42dac
Component: engine
2016-06-11 15:30:27 +02:00
Antonio Murdaca
2454579907
pkg: proxy: fix TCPEchoServer.Close() in unit test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 809207fc7432b59257d4026b98467ba7414014be
Component: engine
2016-06-11 15:27:56 +02:00
Sebastiaan van Stijn
1f06ec7001
Merge pull request #23441 from thaJeztah/update-packagers
...
Update Golang requirements in PACKAGERS.md
Upstream-commit: 2a6abf101173ca5212f56c647c2f5d51bf24ff7b
Component: engine
2016-06-11 15:26:45 +02:00
Sebastiaan van Stijn
90b4d1f145
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 >
Upstream-commit: edadc2f4d737bf4f7aa3c477f2021aae2e551cc2
Component: engine
2016-06-11 01:47:51 +02:00
Darren Stahl
8cfafa6bc0
Removed QoS validation on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ea3a7899f50f623df58d0ef7e0c5318bddaf1877
Component: engine
2016-06-10 16:30:54 -07:00
Alexander Morozov
ad3cf97c76
Merge pull request #23403 from WeiZhang555/split-utils
...
Move GetExitCode to package container and unexport it
Upstream-commit: ee8c512dc32117fbd327b4a19da0ffefe47abfcd
Component: engine
2016-06-10 15:38:06 -07:00
Darren Stahl
96c1665876
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4d8cc9c0a94840a2d45b549925301daa3bfcad3
Component: engine
2016-06-10 15:27:05 -07:00
Stefan J. Wernli
28d7534bc7
Updating call sequence for servicing Windows containers
...
This change adjusts the calling pattern for servcing containers to use waiting on the process instead of expecting start to block. This is safer, as it avoids timeouts in the start code path for the potentially expensive update operation.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: f2ad7be2c4aa13413d539887e8c13fb47bea7254
Component: engine
2016-06-10 15:19:10 -07:00
Antonio Murdaca
6a3cd56f2e
pkg: chrootarchive: chroot_linux: fix mount leak
...
When pivot_root fails we need to unmount the bind mounted path we
previously mounted in preparation for pivot_root.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7d22887b2c8f4de99c3da7c3a0394ca53fb1c4eb
Component: engine
2016-06-11 00:07:41 +02:00
Sebastiaan van Stijn
9befd43508
remove unused defaultExitOnUnhealthy constant
...
the '--exit-on-unhealty' option was removed,
but we forgot to remove this constant.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1dd28788f14d19ac5d9a1248769c689d9398236d
Component: engine
2016-06-11 00:04:05 +02:00
Michael Crosby
2e143d4c3a
Merge pull request #23439 from michael-holzheu/PR-s390x-seccomp-remove-again
...
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
Upstream-commit: 3d0595f1d5aaa52b82a9bdfe7104735c09667860
Component: engine
2016-06-10 14:45:44 -07:00
Sebastiaan van Stijn
7e10f5f788
Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen
...
[carry 23352] update peaceful zen
Upstream-commit: 29283143be0c2d31775dd540433d5a09fc3d1ffc
Component: engine
2016-06-10 23:23:16 +02:00
Sebastiaan van Stijn
3c63c67eb1
Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout
...
(cherry-pick) Increase containerd start-timeout to 2 minutes on master
Upstream-commit: a1f60b9db3edc06f66d8977ebcf66f8ae606baec
Component: engine
2016-06-10 23:21:52 +02:00
Michael Holzheu
13193b473d
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: bf2a577c131d899 ("Enable seccomp for s390x")
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: e6e51d37f7b6509f6422ad97533e9bb581042461
Component: engine
2016-06-10 15:18:58 -04:00
Alexander Morozov
8900670b4f
Merge pull request #23351 from thaJeztah/remove-go-1.4-fix
...
remove fallback for Go 1.4
Upstream-commit: 12970bef34dbad39beb87a87d553020750347ec4
Component: engine
2016-06-10 09:16:46 -07:00
fortinux
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
Vincent Demeester
9268d1b03c
Merge pull request #23433 from thaJeztah/changelog-cherry-pick
...
Cherry-pick 1.11.2 CHANGELOG into master
Upstream-commit: 73169da9db9ee12b421060eae14377cb6ca372d7
Component: engine
2016-06-10 16:28:19 +02:00
Kenfe-Mickael Laventure
743a9e8b07
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 >
Upstream-commit: 64a91ee74e73c956e92801447ae73ba82d168ed5
Component: engine
2016-06-10 16:22:19 +02:00
Kenfe-Mickael Laventure
5203492492
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 >
Upstream-commit: 302a1e61013a2c90ae94a4e7d3e49b9c8ed9d768
Component: engine
2016-06-10 16:16:10 +02:00
Sebastiaan van Stijn
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
Vincent Demeester
1397f0c340
Moving Image{Push,Pull}Privileged to trust.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ad4e20cd92079ec59b175b8a687ddadfa00037eb
Component: engine
2016-06-10 12:07:32 +02:00
Vincent Demeester
5c061ea6cc
Migrate push command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9640e3a4514f96a890310757a09fd77a3c70e931
Component: engine
2016-06-10 12:07:28 +02:00
Vincent Demeester
28e4f2b97c
Migrate pull command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fa67b984f8ec1aa7b8292777210f4643d4bc1bf0
Component: engine
2016-06-10 12:07:23 +02:00
Vincent Demeester
b1ec8d8fe6
Migrate login & logout command to cobra
...
Also moves some common stuff around :
- `api/client/registry.go` for registry related
method (`ElectAuthServer`, …)
- `api/client/credentials.go` to interact with credentials
Migrate logout command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: baf467722b3ca9c3beea5d49e26e7982230e7567
Component: engine
2016-06-10 12:04:29 +02:00
Antonio Murdaca
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Ahmet Alp Balkan
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Tiffany Jernigan
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
John Howard
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
Daniel Nephin
89c35812ee
Support running 'docker help daemon'
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2777f884f6c1cea1efa6ec2e7b6270194e425c4c
Component: engine
2016-06-09 13:22:03 -04:00
Alexander Morozov
0a4c430335
Merge pull request #23413 from vdemeester/client-fix-context-sharing
...
Fix some api/client context sharing/plumbing
Upstream-commit: 5bdc833e44b8ab64b039849f736f8f8077c17ce4
Component: engine
2016-06-09 10:15:10 -07:00
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Aleksa Sarai
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
Vincent Demeester
d7d14dd735
Merge pull request #23408 from absourdnoise/fix-docs-readme-link
...
Fixing man page link in docs/README.md
Upstream-commit: 63a7a59c928ae80cfafa30d2bb569ea8218597e4
Component: engine
2016-06-09 15:59:48 +02:00
Andrew Po
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Felix Ruess
68a32ad8b7
build armhf deb for ubuntu-trusty
...
Signed-off-by: Felix Ruess <felix.ruess@roboception.de >
Upstream-commit: a229e1f4b74a038b604c4d60772db74d4dae3130
Component: engine
2016-06-09 14:06:19 +02:00
Zhang Wei
3c333d1fd5
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 >
Upstream-commit: c111b7eb3d25b5f7a07a6037fcca33282de91ef3
Component: engine
2016-06-09 18:04:53 +08:00
Michael Holzheu
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
Antonio Murdaca
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