b505db5e3c
Merge pull request #10420 from tianon/ubuntu-version
...
Update .deb version numbers to be more sane
2015-01-28 13:50:12 -08:00
0fab79f203
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>
2015-01-28 14:26:40 -07:00
70fbd45a5c
Merge pull request #10123 from duglin/Issue10097
...
Build CMD/ENTRYPOINT cache strings properly
2015-01-28 14:43:16 -05:00
17e840a47a
Merge pull request #10416 from icecrime/update_fish_completion
...
Update fish completion for 1.5.0
2015-01-28 10:28:47 -08:00
45ef269498
Merge pull request #10406 from estesp/fixup-ipv6-bridge-creation
...
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
2015-01-28 10:17:45 -08:00
13b6461570
Merge pull request #10398 from LK4D4/export_daemon_vars
...
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
2015-01-28 09:44:39 -08:00
9cea20ffc5
Update fish completion for 1.5.0
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-01-28 08:52:06 -08:00
2cb82c11cf
Merge pull request #10372 from dmcgowan/v2-registry-buffer-push
...
Buffer tar file on v2 push
2015-01-28 08:47:21 -08:00
f23c136a95
Merge pull request #10357 from jfrazelle/bash-completion-stats
...
Add completion for stats.
2015-01-28 08:29:06 -08:00
c575cc697e
Merge pull request #10403 from stevvooe/v2-status-code-narrow
...
Open up v2 http status code checks for put and head checks
2015-01-28 09:38:45 -05:00
c1f3fe70df
Merge pull request #9137 from shykes/contribution-docs
...
Improve project organization
2015-01-28 01:19:29 -08:00
0c8d17b5c1
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)
2015-01-27 23:54:26 -05:00
8d49ebd338
Merge pull request #10408 from estesp/fix-ipv6-docs
...
Fix incorrect IPv6 addresses/subnet notations in docs
2015-01-27 23:24:52 -05:00
5945de43b0
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)
2015-01-27 22:45:43 -05:00
8893dee098
Merge pull request #10404 from liusdu/liu-dev
...
fix a minor typo in daemon/container.go
2015-01-27 18:26:40 -08:00
629815b424
Buffer tar file on v2 push
...
fixes #10312
fixes #10306
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-27 18:11:05 -08:00
86aea582b6
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>
2015-01-27 18:09:53 -08:00
de52a1998d
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...
2015-01-28 11:55:09 +10:00
71f8b09543
fix a minor typo in daemon/container.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-01-28 09:54:40 +08:00
196cdf1450
Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc
...
Add the registry mirror document to the menu
2015-01-27 20:29:25 -05:00
1d04cc513a
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)
2015-01-28 10:47:11 +10:00
b3402f34b2
Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache
...
V2 manifest tarsum cache
2015-01-27 16:40:49 -08:00
667dc58c39
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>
2015-01-27 16:40:11 -08:00
3ac5596fe0
Merge pull request #10369 from mcfiredrill/etc-host-typo
...
fix /etc/host typo in remote API docs
2015-01-27 18:35:16 -05:00
b2b284b5cd
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
2015-01-27 18:25:55 -05:00
e54d162941
Merge pull request #10371 from jlhawn/fix_build_output_10364
...
Fix premature close of build output on pull
2015-01-27 15:09:17 -08:00
8f7cf87fd9
Merge pull request #10383 from cpuguy83/update_m2dman
...
Update go-md2man
2015-01-27 13:59:58 -08:00
bb4025c4e2
Merge pull request #10230 from tianon/emptyfs
...
Update emptyfs support to work properly if scratch is already an image
2015-01-27 15:01:42 -05:00
b9650ad40b
Merge pull request #10249 from jlhawn/distribution_version_header_10247
...
Split API Version header when checking for v2
2015-01-27 11:48:42 -08:00
c81fb7fa4a
Merge pull request #10197 from vbatts/vbatts-dm_cookie_support
...
devicemapper: API for cookie support
2015-01-27 11:44:03 -08:00
e04cc93a2c
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
2015-01-27 11:22:53 -08:00
83bec40e86
Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression
...
Fixes apparmor regression
2015-01-27 10:46:22 -08:00
ab589b442d
Use layer checksum if calculated during manifest creation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-27 10:21:35 -08:00
e662775ffb
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)
2015-01-27 10:07:01 -08:00
79e8ca04f5
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>
2015-01-27 09:33:42 -05:00
6774be62d6
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>
2015-01-27 14:58:29 +10:00
dcfa881a7b
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-01-27 11:19:02 +08:00
acb8e08296
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
2015-01-26 17:18:00 -08:00
87d2adf070
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
2015-01-27 10:12:54 +09:00
a79d363d2d
Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file
...
Change to load the json.gz file
2015-01-27 11:12:07 +10:00
c48f61cb7a
Merge pull request #10343 from unclejack/shrink_sprites-small_360
...
docs: shrink sprites-small_360.png
2015-01-26 19:28:40 -05:00
f3fef31277
Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api
...
document the ExtraHosts parameter for /containers/create for the remote ...
2015-01-27 10:25:00 +10:00
60089ace48
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)
2015-01-27 09:57:45 +10:00
64f67af2b2
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)
2015-01-27 09:57:44 +10:00
a78130467a
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)
2015-01-27 09:57:44 +10:00
1e41d57bd4
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)
2015-01-27 09:57:43 +10:00
70ea474de9
Merge pull request #10361 from dmcgowan/v2-registry-errors
...
Better error messaging and logging for v2 registry requests
2015-01-26 15:38:22 -08:00
3466baafc1
Merge pull request #10261 from cpuguy83/fix_volume_err_on_symlink_eval
...
Do not return err on symlink eval
2015-01-26 15:12:46 -08:00
e15300b251
Merge pull request #10360 from dmcgowan/keyfile-error-message
...
Add file path to errors loading the key file
2015-01-26 14:44:07 -08:00
bfa0dc47da
Merge pull request #10305 from jlhawn/use_tarsum_v1
...
Always store images with tarsum.v1 checksum added
2015-01-26 14:42:07 -08:00
Michael Crosby
Tianon Gravi
Tibor Vass
Arnaud Porterie
Jessie Frazelle
Solomon Hykes
Phil Estes
James Turnbull
Alexander Morozov
Derek McGowan
Stephen J Day
Sven Dowideit
Liu Hua
Sven Dowideit
Alexander Morozov
Josh Hawn
Brian Goff
Chen Hanxiao
Tony Miller
Sven Dowideit
unclejack