1ca090efba
Add push fallback to v1 for the official registry
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 7d62943178e803663b4939666377b75a21d3e537
Component: engine
2015-01-30 14:37:44 -08:00
78452ce653
Merge pull request #10446 from dmcgowan/defer-key-file-creation
...
Defer creation of trust key file until needed
Upstream-commit: d748ec31d5f89f4cbe363ac9b38310906bf2a9e0
Component: engine
2015-01-29 15:23:35 -08:00
4ef991d58c
Merge pull request #10445 from jlhawn/no_checksum_on_install
...
No longer compute checksum when installing images.
Upstream-commit: 7b65de87710b8efb75df3eb5d7f11ffb92fbfa41
Component: engine
2015-01-29 15:13:29 -08:00
a2ae7e0198
No longer compute checksum when installing images.
...
While checksums are verified when a layer is pulled from v2 registries,
there are known issues where the checksum may change when the layer diff
is computed again. To avoid these issues, the checksum should no longer
be computed and stored until after it has been extracted to the docker
storage driver. The checksums are instead computed lazily before they
are pushed to a v2 registry.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e636df8d9637514e125afe7418a3b98e5270858f
Component: engine
2015-01-29 13:52:59 -08:00
eb1117987a
Defer creation of trust key file until needed
...
Fixes #10442
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 0eed1f4d8da893d7c91be811197032a064053155
Component: engine
2015-01-29 13:46:12 -08:00
11ff60e249
Merge pull request #10430 from duglin/AddBuilderFolks
...
Add builder folks to the top-level maintainers file
Upstream-commit: 8dbaed1d9630d8170e6ad464bb3344fc9049a7a6
Component: engine
2015-01-29 13:32:56 -08:00
569feae573
Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs
...
DHE documentation placeholder and Navbar changes
Upstream-commit: c12fb48a8a7df71ec3b952800ead1f21aea9ada6
Component: engine
2015-01-29 10:23:57 -08:00
7d86677c51
Merge pull request #10293 from SvenDowideit/test-9952
...
comment out the docker and curl lines we'll run later
Upstream-commit: 5b9b5aff06aa0e2c8397ee4cfb62e7f1ea249e0e
Component: engine
2015-01-29 10:18:53 -08:00
dad1ed7610
Merge pull request #10428 from mehulkar/patch-1
...
Improve explanation of port mapping from containers
Upstream-commit: 9e10a888a3d4c804eb4a2aebcf0467b8ae0e4076
Component: engine
2015-01-29 10:07:24 -08:00
b5b158f395
Improve explanation of port mapping from containers
...
Signed-off-by: Mehul Kar <mehul.kar@gmail.com >
Upstream-commit: f1bc02e91f79b4a54f47e0ad4abfd3d48b698ec4
Component: engine
2015-01-29 09:09:44 -08:00
69b545f6ad
Merge pull request #10351 from duglin/FixDocsWorkdir
...
Fix docs so WORKDIR mentions it works for COPY and ADD too
Upstream-commit: ba8e1673ad81f97d836acfdacbed5f4c54a0ef68
Component: engine
2015-01-29 09:52:01 -05:00
00303c7fa9
DHE documentation placeholder and Navbar changes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 0ce3a49d64bcfd81823fe0e9bf54c51ddf6e35d4
Component: engine
2015-01-29 20:50:43 +10:00
e6f8a05595
Merge pull request #10433 from guoxiuyan/Fix_typo
...
Fix a minor typo
Upstream-commit: d400ac756cae9c937089f9f20bcc75826e99ea67
Component: engine
2015-01-28 20:57:35 -08:00
afb2843935
Add builder folks to the top-level maintainers file
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 761a020f9dbb5e5610dce0dc8c762de09f8a0d46
Component: engine
2015-01-28 18:32:38 -08:00
09a29b4b64
Merge pull request #10368 from jfrazelle/lingering-exec-test
...
Move one last exec test :)
Upstream-commit: fb9363eb2a859684aefc46d5854f05ed02e74bcf
Component: engine
2015-01-28 21:21:05 -05:00
5dbf91e768
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com >
Upstream-commit: 07d190a61c60cff2f20186e700abca46f18d35ac
Component: engine
2015-01-29 10:15:56 +08:00
2fe4c8a4a6
Merge pull request #10142 from thaJeztah/docs-use-example-image
...
Replace "base" with "debian" in API documentation
Upstream-commit: c9b03c6095baba37f2fb276459f30c29d156f427
Component: engine
2015-01-28 20:40:02 -05:00
65b792b36b
Replace "base" with "ubuntu" in documentation
...
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.
This changes the API documentation to use "ubuntu" in stead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c0969ed3d896c9add0a2cca7b9a9074cd138571b
Component: engine
2015-01-28 22:54:10 +01:00
5946d2896a
Merge pull request #10420 from tianon/ubuntu-version
...
Update .deb version numbers to be more sane
Upstream-commit: b505db5e3c0b5ca60977e268572a05c499f4703c
Component: engine
2015-01-28 13:50:12 -08:00
44e00a8ff5
Update .deb version numbers to be more sane
...
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.
---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev
---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
```
As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```
ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 0fab79f20343db9d95da191cf473651c3c8f5f42
Component: engine
2015-01-28 14:26:40 -07:00
c60988becd
Merge pull request #10123 from duglin/Issue10097
...
Build CMD/ENTRYPOINT cache strings properly
Upstream-commit: 70fbd45a5c88f6f39a07b04f81a07721bf5f3eed
Component: engine
2015-01-28 14:43:16 -05:00
55694ca80d
Merge pull request #10416 from icecrime/update_fish_completion
...
Update fish completion for 1.5.0
Upstream-commit: 17e840a47a7e65a96d53db1bbace43f59a4b1a31
Component: engine
2015-01-28 10:28:47 -08:00
221da50df3
Merge pull request #10406 from estesp/fixup-ipv6-bridge-creation
...
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
Upstream-commit: 45ef269498983d8068e214b521e7e0aa1db5ae4d
Component: engine
2015-01-28 10:17:45 -08:00
90f3a4705d
Merge pull request #10398 from LK4D4/export_daemon_vars
...
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
Upstream-commit: 13b646157099ccf7566afdefd58b98cd1f52ab99
Component: engine
2015-01-28 09:44:39 -08:00
3665f098e8
Update fish completion for 1.5.0
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9cea20ffc5904201efdda2c8d6623759e15ad8eb
Component: engine
2015-01-28 08:52:06 -08:00
942d5a9a17
Merge pull request #10372 from dmcgowan/v2-registry-buffer-push
...
Buffer tar file on v2 push
Upstream-commit: 2cb82c11cf43df0590a803c8733a8e77be704b85
Component: engine
2015-01-28 08:47:21 -08:00
250ef0009a
Merge pull request #10357 from jfrazelle/bash-completion-stats
...
Add completion for stats.
Upstream-commit: f23c136a951662d74d4e6a18a556aaaaffb9a102
Component: engine
2015-01-28 08:29:06 -08:00
4020018685
Merge pull request #10403 from stevvooe/v2-status-code-narrow
...
Open up v2 http status code checks for put and head checks
Upstream-commit: c575cc697e3dc6e4ca7d141cd85c0e42904eef30
Component: engine
2015-01-28 09:38:45 -05:00
3260745a60
Merge pull request #9137 from shykes/contribution-docs
...
Improve project organization
Upstream-commit: c1f3fe70df137c0422d3a22f53e3e8333568385b
Component: engine
2015-01-28 01:19:29 -08:00
c59fff945d
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
...
This fixes the daemon's failure to start when setting --ipv6=true for
the first time without deleting `docker0` bridge from a prior use with
only IPv4 addressing.
The addition of the IPv6 bridge address is factored out into a separate
initialization routine which is called even if the bridge exists but no
IPv6 addresses are found.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 0c8d17b5c1a142bc09abe1105d985e76db6f225d
Component: engine
2015-01-27 23:54:26 -05:00
15ba70ac25
Merge pull request #10408 from estesp/fix-ipv6-docs
...
Fix incorrect IPv6 addresses/subnet notations in docs
Upstream-commit: 8d49ebd3381af51370df346b797515b4a32ac153
Component: engine
2015-01-27 23:24:52 -05:00
937fb930a0
Fix incorrect IPv6 addresses/subnet notations in docs
...
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 5945de43b02406dbc0eee44954eb21e5926bde00
Component: engine
2015-01-27 22:45:43 -05:00
663f98ad3f
Merge pull request #10404 from liusdu/liu-dev
...
fix a minor typo in daemon/container.go
Upstream-commit: 8893dee098926668ea76d83a61a4f27d6088b9ac
Component: engine
2015-01-27 18:26:40 -08:00
480c2d788f
Buffer tar file on v2 push
...
fixes #10312
fixes #10306
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 629815b42472635c87ec6ce9ed4ec37019ae4ffa
Component: engine
2015-01-27 18:11:05 -08:00
22f9d9e216
Open up v2 http status code checks for put and head checks
...
Under certain cases, such as when putting a manifest or check for the existence
of a layer, the status code checks in session_v2.go were too narrow for their
purpose. In the case of putting a manifest, the handler only cares that an
error is not returned. Whether it is a 304 or 202 does not matter, as long as
the server reports success. Having the client only accept specific http codes
inhibits future protocol evolution.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 86aea582b66929c68de3346a26a26633b62a5784
Component: engine
2015-01-27 18:09:53 -08:00
b15db42113
Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks
...
tell users they can what IP range Hub webhooks can come from so they can...
Upstream-commit: de52a1998dbec1b5a7f9e27bcf527971b8df3666
Component: engine
2015-01-28 11:55:09 +10:00
fa63a036de
fix a minor typo in daemon/container.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 71f8b09543d782727ada8f63ba7d6fa177ec54db
Component: engine
2015-01-28 09:54:40 +08:00
5765efce31
Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc
...
Add the registry mirror document to the menu
Upstream-commit: 196cdf145032f64c0b45cf4f3bd87193cfa8d124
Component: engine
2015-01-27 20:29:25 -05:00
6813c73a03
Add the registry mirror document to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1d04cc513a958009131ca54bd6904be14fef774e
Component: engine
2015-01-28 10:47:11 +10:00
0388864ff5
Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache
...
V2 manifest tarsum cache
Upstream-commit: b3402f34b2049a0e82a061640f04c707b8cca99b
Component: engine
2015-01-27 16:40:49 -08:00
373fc40d21
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
...
This needed for our "small" testing daemon using same config as "big"
testing daemon.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 667dc58c3929112a2b8b8bc67ae54a394169c6df
Component: engine
2015-01-27 16:40:11 -08:00
adf36f2445
Merge pull request #10369 from mcfiredrill/etc-host-typo
...
fix /etc/host typo in remote API docs
Upstream-commit: 3ac5596fe05a910a91f021de10b2c6cd16eacb07
Component: engine
2015-01-27 18:35:16 -05:00
f7f3e75906
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
Upstream-commit: b2b284b5cdb1df2bbde896bff6dbbe87a8853a71
Component: engine
2015-01-27 18:25:55 -05:00
36a2c69c23
Merge pull request #10371 from jlhawn/fix_build_output_10364
...
Fix premature close of build output on pull
Upstream-commit: e54d1629415d82bada1952bd7be7ccfdc21dd015
Component: engine
2015-01-27 15:09:17 -08:00
77b0c4eb7e
Merge pull request #10383 from cpuguy83/update_m2dman
...
Update go-md2man
Upstream-commit: 8f7cf87fd90a2d86f51e8a121ad759f4b1ab5265
Component: engine
2015-01-27 13:59:58 -08:00
c589d39732
Merge pull request #10230 from tianon/emptyfs
...
Update emptyfs support to work properly if scratch is already an image
Upstream-commit: bb4025c4e206cf46de3ba3267efb3df96db45b91
Component: engine
2015-01-27 15:01:42 -05:00
29be632832
Merge pull request #10249 from jlhawn/distribution_version_header_10247
...
Split API Version header when checking for v2
Upstream-commit: b9650ad40bd4db3b570f30b158eb9494bb06da8c
Component: engine
2015-01-27 11:48:42 -08:00
dbb2daa29d
Merge pull request #10197 from vbatts/vbatts-dm_cookie_support
...
devicemapper: API for cookie support
Upstream-commit: c81fb7fa4a41dfdc21eb37dade0eb71bd1dfa855
Component: engine
2015-01-27 11:44:03 -08:00
2e68f2825a
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
Upstream-commit: e04cc93a2c92638bb00af8bae8f5a165ed036bfa
Component: engine
2015-01-27 11:22:53 -08:00
ed313f44e2
Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression
...
Fixes apparmor regression
Upstream-commit: 83bec40e86a8773b787cf40881dec2c8ece4ced9
Component: engine
2015-01-27 10:46:22 -08:00
