412d1581d2
Attempt to retain tagging behavior
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 1e653ab645b513966c3fe9b13db7a5a9c9a8acb7
Component: engine
2015-05-29 15:20:37 -07:00
395ceacd61
Properly verify manifests and layer digests on pull
...
To ensure manifest integrity when pulling by digest, this changeset ensures
that not only the remote digest provided by the registry is verified but also
that the digest provided on the command line is checked, as well. If this check
fails, the pull is cancelled as with an error. Inspection also should that
while layers were being verified against their digests, the error was being
treated as tech preview image signing verification error. This, in fact, is not
a tech preview and opens up the docker daemon to man in the middle attacks that
can be avoided with the v2 registry protocol.
As a matter of cleanliness, the digest package from the distribution project
has been updated to latest version. There were some recent improvements in the
digest package.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 06612cc0fee103bf6f46429e3cd572725ef72948
Component: engine
2015-05-29 15:20:28 -07:00
a03d351804
Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all
...
fix bug with rmi multiple tag
Upstream-commit: eaa9c1b97e3b28c6e2a16c7e593238bb43e1f9dc
Component: engine
2015-05-29 15:10:22 -07:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
9b9477d660
Merge pull request #13567 from draghuram/apiver
...
Make the version mismatch message more explicit.
Upstream-commit: d79654d0f67c88ceb6b6c2747a2402d248ecea45
Component: engine
2015-05-29 23:39:48 +02:00
b68a27ad2e
Merge pull request #13601 from tianon/precise
...
Finally add precise/12.04 as a build-deb target
Upstream-commit: d96ca04f249e19c2d259052371a026ae4d48a3a1
Component: engine
2015-05-29 14:35:07 -07:00
277284056b
Merge pull request #13446 from runcom/remove-PortSpecs
...
Remove PortSpecs from Config
Upstream-commit: ec167972bf15db8861eed8912b791a4aa9bb9efa
Component: engine
2015-05-29 14:31:48 -07:00
7112e31245
Merge pull request #13604 from tianon/vim-embedded-shell
...
Add embedded shell script highlight to vim syntax
Upstream-commit: 4d9191e15d457adaa9f7721828ee06cd6eb51b1d
Component: engine
2015-05-29 14:17:07 -07:00
6f2ef90bf2
Merge pull request #13605 from tianon/vim-dockerfile
...
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
Upstream-commit: e2524d8ace359497e9e02eaa90c3d36ef6c36508
Component: engine
2015-05-29 14:16:50 -07:00
7d3e38efca
Merge pull request #13527 from duglin/FixImagesPrefixNotFound
...
Fix error when trying to delete an image due to a bad container
Upstream-commit: a39de418719dc6189025a760ca6b5c024a177b24
Component: engine
2015-05-29 14:09:26 -07:00
9712652e10
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 185f392691c40fc4cb6ea16373a92a03f3d0b0f2
Component: engine
2015-05-29 14:04:06 -07:00
1efd411c44
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
Upstream-commit: 1680c78e630611a968b24a7064b1a1cd80614d75
Component: engine
2015-05-29 16:59:17 -04:00
03bef78b33
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
Upstream-commit: 8d726709ad1479693c3c326fd69b432799b82192
Component: engine
2015-05-29 16:57:27 -04:00
eafc23fd4d
Add note about overlay not being production ready
...
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 67cb748e26c3b6979983493f307a38b59e291642
Component: engine
2015-05-29 13:53:09 -07:00
4b65abde07
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: e02744404d34027d1b358986bedd8557805aae58
Component: engine
2015-05-29 13:46:51 -07:00
b8a51baa80
Add embedded shell script highlight to vim syntax
...
This highlights `RUN`, `CMD`, and `ENTRYPOINT` lines using shell highlighting. It doesn't bother detecting the JSON forms, but that's OK because JSON arrays highlight pretty reasonably with shell highlights. :)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 62d3b1bf2e830b6cdf7c4df86d356d48b58b1ab0
Component: engine
2015-05-29 13:39:37 -07:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
d7b3086241
Merge pull request #13589 from vdemeester/pkg-stringutils-test-coverage
...
Add test coverage for pkg/stringutils
Upstream-commit: 3b831a2f3af01727ba91fc52c31c6682eeef69b3
Component: engine
2015-05-29 13:38:12 -07:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
24139366a7
Merge pull request #13564 from burke/fix-memory-leak
...
Use bufio.Reader instead of bufio.Scanner for logger.Copier
Upstream-commit: c42810fe9981c07e7de55aa65af44d618dd4e6ce
Component: engine
2015-05-29 13:37:15 -07:00
5058d1b5fc
Merge pull request #13255 from vdemeester/11588-pkg-pools-test-coverage
...
Add test coverage for pkg/pools (#11588 )
Upstream-commit: 04a451998f28054972d5cd4c26082c4092a9dc35
Component: engine
2015-05-29 13:36:20 -07:00
5fa31c9647
Merge pull request #13598 from calavera/fix_windows_build
...
Do not require cgroups capabilities on windows to run the integration tests.
Upstream-commit: 4c9fd72a91543bff32241198704f77fa38eaf5c8
Component: engine
2015-05-29 12:57:40 -07:00
efadb1b4ee
Finally add precise/12.04 as a build-deb target
...
Ubuntu Precise has a number of warts that made it non-trivial to add initially, but I've managed to work through some of them and come up with a working build. Two important parts to note are that it has neither the `btrfs` nor the `devicemapper` graphdriver backends since `btrfs-tools` and `libdevmapper-dev` in the precise repositories are too ancient for them to even compile.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 98180b89543396c07c1f1ea420554fbcce31c513
Component: engine
2015-05-29 12:55:58 -07:00
27dbc6f29e
Merge pull request #13581 from s7v7nislands/fix_lxc_url
...
update lxc url
Upstream-commit: b21ef2d1d31431b9628ae39a77050a5897369b06
Component: engine
2015-05-29 11:48:44 -07:00
9a7a5b0edf
Do not require cgroups capabilities on windows to run the integration tests.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9141012966db62b36b7d3d1df7af877bbd2d172
Component: engine
2015-05-29 11:42:40 -07:00
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
b652716d1c
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
Upstream-commit: f1fed87fc01c31114b78a6ca9f7060fc93480957
Component: engine
2015-05-29 10:21:57 -07:00
a4e456d439
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
2015-05-29 10:00:22 -07:00
278360f512
Merge pull request #13585 from albers/completion-1.7
...
Update bash completion for 1.7.0
Upstream-commit: 24d9edd8d11a383b77019099214e36029e49919b
Component: engine
2015-05-29 09:43:44 -07:00
c9400d42cc
Use bufio.Reader instead of bufio.Scanner for logger.Copier
...
When using a scanner, log lines over 64K will crash the Copier with
bufio.ErrTooLong. Subsequently, the ioutils.bufReader will grow without
bound as the logs are no longer being flushed to disk.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: f779cfc5d8b8f0686c3849a3bd4ab0480675180d
Component: engine
2015-05-29 12:29:42 -04:00
4f2d3e6e12
Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs
...
Fixing Mac Boot2Docker installation doc Your fix has left the building.
Upstream-commit: 87d36079a79775c481a3483c2424cbecb1fbb887
Component: engine
2015-05-29 09:13:04 -07:00
7df85a8e31
Merge pull request #13563 from calavera/fix_bind_mount_regression
...
Mount bind volumes coming from the old volumes configuration.
Upstream-commit: 00b8d37084934c5389afe3fd5558c7694cde0593
Component: engine
2015-05-29 11:13:33 -04:00
995b2ea375
Add test coverage for pkg/stringutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6c36572e8b77bd7a4e8c1afa5be00fb4e7618c12
Component: engine
2015-05-29 15:49:29 +02:00
431c5ef3c2
Merge pull request #13583 from vdemeester/pkg-timeutils-test-coverage
...
Add test coverage to pkg/timeutils
Upstream-commit: 34342e9cef5499aa6d67d1e53cb33be9aaf54d2c
Component: engine
2015-05-29 09:35:34 -04:00
fe89ed5cd6
avoid 88-chars mountpoint length limit on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 112b7e654691caa2b5ec283d70cf36245dfab365
Component: engine
2015-05-29 16:33:04 +03:00
20f015366e
Merge pull request #12773 from HuKeping/update-docs
...
Fix inconsistent of remote API and document
Upstream-commit: 059dc15ab94f1d737e2536b6109017079802f763
Component: engine
2015-05-29 06:27:15 -07:00
ace81f28be
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 22fda380a97795cd83ad8bc4027e1bcd1ad490a6
Component: engine
2015-05-29 22:56:35 +08:00
1f0c675929
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9aa8a590b74e5260df649c303d9b03d52cbb32bb
Component: engine
2015-05-29 15:09:35 +02:00
7e5bfe1810
Update bash completion for 1.7.0
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b2832dffe5563486dd9dec7ed1b0183a1f320a2e
Component: engine
2015-05-29 12:42:59 +02:00
bd48177d0f
update lxc url
...
Signed-off-by: XiaoBing Jiang <s7v7nislands@gmail.com >
Upstream-commit: 2b69b326bc3a061ef0f277f35da336d20f3f6bcb
Component: engine
2015-05-29 16:10:57 +08:00
49406310ca
return error when failed to read http response body
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: de225b5d130f40189297e12ceb1593949ca24219
Component: engine
2015-05-29 12:52:51 +08:00
731e6df224
bug fix: close http response body no longer in use
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6c49576a860433d89b3c2d651bdca386353128cc
Component: engine
2015-05-29 12:03:40 +08:00
54f8d58fdb
Fixing Mac Boot2Docker installation doc
...
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu >
Upstream-commit: 27ffccf540fa9a5b0e0bbd999a36b4c8c54a8f93
Component: engine
2015-05-28 22:53:54 -05:00
fd72895a8e
Merge pull request #13566 from jfrazelle/fix-lxc-tests
...
skip test on lxc
Upstream-commit: 7f6a7973cd12048a6518321d4d0eae55437a44e8
Component: engine
2015-05-28 16:19:21 -07:00
3b9c3b2725
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
Upstream-commit: fcdea09ea52391d1a36b514acd9f1e77d092bd35
Component: engine
2015-05-28 16:14:30 -07:00
5efbaa4c3a
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
Upstream-commit: 7317b84ce0fd85c8ab2e6c1dda07567225299805
Component: engine
2015-05-28 15:51:06 -07:00
8d306cf8a5
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
2015-05-29 00:42:11 +02:00
16f1d90a66
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: e76d0f55717e08eff68604a52f0b2f1d7c27809c
Component: engine
2015-05-28 15:32:05 -07:00
0729d1a2d6
Merge pull request #13562 from moxiegirl/fixes-to-119-api
...
Fixes to the 1.19 version Thank you @thaJeztah and @jfrazelle!
Upstream-commit: 742a8a6cffb4a8607fc803aaaf18b51e927bbbda
Component: engine
2015-05-28 15:25:08 -07:00
9a122de919
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
2015-05-28 17:54:48 -04:00
