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
6c59418704
Use layer checksum if calculated during manifest creation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: ab589b442d55597de74201729ba893977ea73b7f
Component: engine
2015-01-27 10:21:35 -08:00
3c4927bcb2
Fix premature close of build output on pull
...
The build job will sometimes trigger a pull job when the base image
does not exist. Now that engine jobs properly close their output by default
the pull job would also close the build job's stdout in a cascading close
upon completion of the pull.
This patch corrects this by wrapping the `pull` job's stdout with a
nopCloseWriter which will not close the stdout of the `build` job.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e662775ffb096fdb4a7f247bb25b8e3022006c1b
Component: engine
2015-01-27 10:07:01 -08:00
dd5b8c65d4
Update go-md2man
...
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.
`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e8ca04f5764c150b61b1b05785fb3926613fa1
Component: engine
2015-01-27 09:33:42 -05:00
f2a3416f81
tell users they can what IP range Hub webhooks can come from so they can filter
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 6774be62d647b2e2f258bc7b4158cb9e10a3ecf6
Component: engine
2015-01-27 14:58:29 +10:00
bdc325d2e4
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: dcfa881a7b12e9a737b25ada98ec0c76e58c9c9c
Component: engine
2015-01-27 11:19:02 +08:00
332ce60368
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
Upstream-commit: acb8e08296b2570d109af3fdb447f470fdb5f665
Component: engine
2015-01-26 17:18:00 -08:00
aa7720d90d
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com >
Upstream-commit: 87d2adf070a44d3d62dfe7ca8c13e95e92f53b64
Component: engine
2015-01-27 10:12:54 +09:00
b740a402ee
Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file
...
Change to load the json.gz file
Upstream-commit: a79d363d2dca151d4e0056e3ebd0481b6046e26f
Component: engine
2015-01-27 11:12:07 +10:00
1565e00fb1
Merge pull request #10343 from unclejack/shrink_sprites-small_360
...
docs: shrink sprites-small_360.png
Upstream-commit: c48f61cb7a22cebd7f8074f481e69a62122ed70e
Component: engine
2015-01-26 19:28:40 -05:00
2bb1b521d1
Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api
...
document the ExtraHosts parameter for /containers/create for the remote ...
Upstream-commit: f3fef3127742a2128990d6f824681695478833bc
Component: engine
2015-01-27 10:25:00 +10:00
bb8e8fc2eb
as we're not using the search suggestion feature only load the search_content when we have a search ?q= param
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 60089ace4895d9ab9c9fe9f2fb4b0db8a0d9aeda
Component: engine
2015-01-27 09:57:45 +10:00
995b6fcdbf
set the content-type for the search_content.json.gz
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 64f67af2b2bab7c9d3b4458b194c10f7428bf257
Component: engine
2015-01-27 09:57:44 +10:00
763fcb05c8
Change to load the json.gz file
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a78130467a03b95d1852bb2e6d10120bd8e6a6e7
Component: engine
2015-01-27 09:57:44 +10:00
124596416c
docs: compress search_content.json for release
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Docker-DCO-1.1-Signed-off-by: unclejack <unclejacksons@gmail.com > (github: SvenDowideit)
Upstream-commit: 1e41d57bd44bd503d0642c8ea20123541c146218
Component: engine
2015-01-27 09:57:43 +10:00
a3cfeb1217
Merge pull request #10361 from dmcgowan/v2-registry-errors
...
Better error messaging and logging for v2 registry requests
Upstream-commit: 70ea474de9bb7474d8859a05e98d21f98a05c7eb
Component: engine
2015-01-26 15:38:22 -08:00
76b4f43eee
Merge pull request #10261 from cpuguy83/fix_volume_err_on_symlink_eval
...
Do not return err on symlink eval
Upstream-commit: 3466baafc16ff4592f2b5714dd74f781d67487bc
Component: engine
2015-01-26 15:12:46 -08:00
b2ffb55f86
Merge pull request #10360 from dmcgowan/keyfile-error-message
...
Add file path to errors loading the key file
Upstream-commit: e15300b251e813cd8b262832fccc8af475979f1c
Component: engine
2015-01-26 14:44:07 -08:00
c4558ad58c
Merge pull request #10305 from jlhawn/use_tarsum_v1
...
Always store images with tarsum.v1 checksum added
Upstream-commit: bfa0dc47da2d9e6399fa32bda72a7074224c815d
Component: engine
2015-01-26 14:42:07 -08:00
e63f5dfefb
Better error messaging and logging for v2 registry requests
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d277714614f62dba276227f70cc2a47eac6e02e7
Component: engine
2015-01-26 14:00:51 -08:00
