Olivier Gambier
9473210fb4
Merge pull request #1932 from hairyhenderson/upgrade-to-go-1.5.1
...
Updating CI builds to use Go 1.5.1
2015-10-12 11:06:28 -07:00
Arnaud Porterie
c2d21fa9d3
Remove fredlf from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-10-12 10:58:04 -07:00
Brian Goff
a82e3bc704
Allow API to bind to ipv6 addresses
...
Use `net.SplitHostPort` which supports ipv6 rather than relying on
splitting on `:`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-10-12 13:55:27 -04:00
Aaron Lehmann
cba4bbad4f
Remove trust package
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-12 10:51:28 -07:00
Aaron Lehmann
011bfd666e
Unmarshal signed payload when pulling by digest
...
Add a unit test for validateManifest which ensures extra data can't be
injected by adding data to the JSON object outside the payload area.
This also removes validation of legacy signatures at pull time. This
starts the path of deprecating legacy signatures, whose presence in the
very JSON document they attempt to sign is problematic. These
signatures were only checked for official images, and since they only
caused a weakly-worded message to be printed, removing the verification
should not cause impact.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-12 10:51:28 -07:00
Tonis Tiigi
504e67b867
Calculate hash based image IDs on pull
...
Generate a hash chain involving the image configuration, layer digests,
and parent image hashes. Use the digests to compute IDs for each image
in a manifest, instead of using the remotely specified IDs.
To avoid breaking users' caches, check for images already in the graph
under old IDs, and avoid repulling an image if the version on disk under
the legacy ID ends up with the same digest that was computed from the
manifest for that image.
When a calculated ID already exists in the graph but can't be verified,
continue trying SHA256(digest) until a suitable ID is found.
"save" and "load" are not changed to use a similar scheme. "load" will
preserve the IDs present in the tar file.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-12 10:51:28 -07:00
Phil Estes
67034e5003
Merge pull request #16947 from Microsoft/jjh/daemon-broken-on-master
...
Windows: Daemon broken on master
2015-10-12 13:40:02 -04:00
Diogo Mónica
aac911c91c
Merge pull request #214 from vikstrous/fix_makefile
...
Revert "add `make install`, fix #202 "
2015-10-12 10:08:11 -07:00
Viktor Stanchev
48e6ecedca
Revert "add make install, fix #202 "
...
This reverts commit 77a16d3116 .
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com >
2015-10-12 10:04:31 -07:00
Arnaud Porterie
b0cbc02283
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
2015-10-12 10:03:18 -07:00
Alexander Morozov
2d1414e8b0
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
2015-10-12 09:15:51 -07:00
John Howard
bfe252b781
Windows: Daemon broken on master
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-12 09:11:19 -07:00
Antonio Murdaca
d7177c1224
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
2015-10-12 17:49:10 +02:00
Victor Costan
26bd356078
Document CFS CPU period / quota support in the API.
...
Docker 1.7 got support for specifying the CFS scheduler's CPU quota and
period. The work appears to have started around commit
dcc50e1d59 . This change updates the API
documentation to reflect the existing support.
Signed-off-by: Victor Costan <costan@gmail.com >
2015-10-12 11:26:39 -04:00
Antonio Murdaca
08c5f52d70
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
2015-10-12 17:24:42 +02:00
Daniel Hiltgen
ab83cf37c9
Document updates for cluster-store-opt
...
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
2015-10-12 08:05:02 -07:00
Phil Estes
79240b9eaf
Correct mismatched function names (UID() and Gid())
...
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-10-12 10:58:33 -04:00
Mihuleacc Sergiu
fad2cc6a18
Add CMD and EXPOSE instruction example
...
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com >
2015-10-12 17:30:47 +03:00
Phil Estes
a9e5cb0efb
Merge pull request #16933 from ZJU-SEL/update-save-load-test-16756
...
update test using c.Assert replace c.Fatal
2015-10-12 09:54:13 -04:00
Antonio Murdaca
56ed0a6e8c
Merge pull request #16931 from SvenDowideit/minor-dind-error-msg-nit
...
Missing a single dash in error message
2015-10-12 15:18:45 +02:00
Dave Henderson
7a3f2ec446
Updating CI builds to use Go 1.5.1
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-10-12 08:26:58 -04:00
Hao Zhang
d5830d66e0
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
2015-10-12 06:32:21 -04:00
Steve Durrheimer
24174e8a84
Add zsh completion for 'docker network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-12 12:06:12 +02:00
Lei Jitang
e38767e197
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-12 04:49:25 -04:00
Mageee
d4d0718ebf
update docker_cli_version_test.go
...
fix spelling mistake again
Signed-off-by: Mageee <fangpuyi@foxmail.com >
2015-10-12 15:13:31 +08:00
Sven Dowideit
4e899d64e0
Missing a single dash in error message
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-10-11 22:46:14 -07:00
Xiaoxu Chen
a9c7c48cca
update integration-cli/docker_cli_netmode_test.go
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
refactor integration-cli/docker_cli_netmode_test.go use Assert statement
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_netmode_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
2015-10-12 13:34:43 +08:00
Alexander Morozov
9273c53d83
Merge pull request #16929 from HuKeping/add-back
...
Comment: add some lines back
2015-10-11 22:12:21 -07:00
Hu Keping
a066b94ef0
Comment: add some lines back
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-10-12 19:34:58 +08:00
Arnaud Porterie
32c3b99663
Merge pull request #16930 from duglin/RemoveParam
...
Remove used param on ParseHost
2015-10-11 21:37:03 -07:00
Doug Davis
ba973f2d74
Remove used param on ParseHost
...
The first param on opts.ParseHost() wasn't being used for anything.
Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-10-11 20:45:17 -07:00
Mary Anthony
81c2d9ed47
Add a link to blog post
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-11 20:25:41 -07:00
Kun Zhang
0ff3123eba
volume create error on conflict option
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
2015-10-12 11:16:39 +08:00
Jeffrey Morgan
cac6d99564
Temporary, improved conclusion text - tell user how to upgrade their VM.
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 19:43:32 -07:00
Jeffrey Morgan
72ebba3410
WIP windows upgrade
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 19:02:13 -07:00
Jeffrey Morgan
da62a9a3e7
Mac OS X Upgrade
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 18:20:48 -07:00
Jeffrey Morgan
ba639b26cf
Merge branch 'master' into upgrade
2015-10-11 18:02:42 -07:00
Jeffrey Morgan
f2dc1a7098
Merge branch 'master' of github.com:docker/toolbox
2015-10-11 17:37:40 -07:00
Jeffrey Morgan
b1e77fb8ff
Fix detection of VBoxManage.exe location
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 17:37:38 -07:00
Jeffrey Morgan
658abcd30b
Temporarily fix stop button
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 17:21:56 -07:00
Jeffrey Morgan
a4bd97fe27
Fix port rendering
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 17:14:03 -07:00
Jeffrey Morgan
06f3901af8
Merge pull request #237 from jeffdm/master
...
Add note to help users fix tty errors with winpty
2015-10-11 16:20:22 -07:00
Jeffrey Morgan
48db88bde3
Updated start.sh messaging for winpty & interactive support
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 15:59:09 -07:00
Sebastiaan van Stijn
c45ad0b02d
Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
...
Default the tcp port to 2376 if tls is on, and 2375 if not
2015-10-11 15:35:04 -07:00
Jeffrey Morgan
8e0fbecb05
Fix bug where other installations of bash would not trigger --login flag in Quickstart Terminal
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-11 15:29:22 -07:00
Sebastiaan van Stijn
70edf41c06
Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
...
Docs: add Docker version/API version matrix
2015-10-11 15:28:46 -07:00
Mary Anthony
570d8c1e55
Updating release notes for CS Engine
...
Updating with meatier language
Adding Nathan comment
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-11 15:13:28 -07:00
Victor Vieux
2a46e2d3ab
Merge pull request #1278 from jimmyxian/fix-rename-test
...
Fix rename test
2015-10-11 15:07:54 -07:00
Vincent Demeester
6e12d9fe62
Merge pull request #16865 from MHBauer/registry-service-refactor
...
refactor away direct references to daemon member
2015-10-11 21:47:58 +02:00
Sebastiaan van Stijn
3a24eb2de4
Merge pull request #16618 from abronan/fix_discovery_pkg_readme
...
Fix discovery package README with the right --cluster* flags
2015-10-11 12:05:07 -07:00