Jessie Frazelle
c80256a31d
Merge pull request #13915 from tianon/validate-pkg
...
Add new "validate-pkg" bundlescript
2015-06-16 10:09:11 -07:00
Tibor Vass
952d030be2
Merge pull request #13955 from jfrazelle/update-install-script-w-experimental-gpg
...
add gpg fingerprint for experimental
2015-06-16 12:44:40 -04:00
Alexander Morozov
2420ef8cf1
Merge pull request #13972 from tiborvass/update-go-net
...
Update vendored go.net to use golang.org/x/net canonical path
2015-06-16 09:37:07 -07:00
Tibor Vass
de6e6d4b28
Merge pull request #13965 from cpuguy83/fix_windows_vfs_import
...
Fix circular import for windows vfs graphdriver
2015-06-16 12:32:24 -04:00
Tibor Vass
d820e00aac
Update vendored go.net to use golang.org/x/net canonical path
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-06-16 11:40:04 -04:00
Brian Goff
49834e8d59
Fix circular import for windows vfs graphdriver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-16 09:08:10 -04:00
moxiegirl
57aa0248af
Merge pull request #13960 from yous/fix-static-file-links
...
Remove `sources/` under `docs` directory
2015-06-16 05:54:23 -07:00
ChaYoung You
3f4eeca68f
Remove `sources/` under `docs` directory
...
See #13936 .
Signed-off-by: ChaYoung You <yousbe@gmail.com>
2015-06-16 19:15:48 +09:00
Jessica Frazelle
957622d452
add gpg fingerprint for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-15 18:49:22 -07:00
Brian Goff
9dffd032f4
Merge pull request #13950 from Microsoft/10662-vfsforreal
...
Windows - Really fix VFS this time
2015-06-15 21:41:12 -04:00
Jessie Frazelle
b81f2ee5f2
Merge pull request #13953 from crosbymichael/network-mtu
...
Get Mtu from default route
2015-06-15 17:13:44 -07:00
Michael Crosby
ff4e58ff56
Get Mtu from default route
...
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface. If there is no default route, default to a
mtu of 1500.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-15 16:33:02 -07:00
David Calavera
f48fadd05c
Merge pull request #13941 from unclejack/fix_umask
...
docker/daemon: set umask to the default on startup
2015-06-15 16:19:38 -07:00
Jessie Frazelle
4d23f459ad
Merge pull request #13947 from mavenugo/vin
...
Picking up missed out vendor files via hack/vendor.sh
2015-06-15 16:16:02 -07:00
Jessie Frazelle
748814a97a
Merge pull request #13935 from asbjornenge/tm_syntax_updates
...
TM syntax updates
2015-06-15 16:12:22 -07:00
John Howard
59cfc08982
Windows - Really fix VFS this time
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-15 15:09:48 -07:00
Antonio Murdaca
835f1c9116
Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
...
Correct the message of pause and unpause a non-running container
2015-06-15 23:56:32 +02:00
Josh Hawn
86d6a5b11f
Merge pull request #13869 from jlhawn/multi_line_help_usage
...
api/client: Allow for multi-line usage help
2015-06-15 14:50:17 -07:00
Arnaud Porterie
b3b04fd85a
Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
...
Store layer digests on pull
2015-06-15 14:37:30 -07:00
moxiegirl
d409b05970
Merge pull request #13936 from moxiegirl/test-tooling
...
Updated retooling for Hugo to go out with 1.7
2015-06-15 13:57:12 -07:00
Mary Anthony
f93fee5f48
retooling for hugo
...
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-15 13:19:38 -07:00
Madhu Venugopal
dcc4a14ba3
Picking up missed out vendor files via hack/vendor.sh
...
while wokring on another PR, I noticed that hack/vendor.sh was picking
up unrelated files. Maybe a previous update to the hack/vendor.sh failed
to run the script and push the vendor changes ?
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-15 11:38:06 -07:00
Michael Crosby
3f11e05db2
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
2015-06-15 11:25:35 -07:00
Derek McGowan
a98ea87e46
Store layer digests on pull
...
Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.
Fixes #13883
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-06-15 11:08:21 -07:00
David Calavera
d8592eaff8
Revert "contrib/init: unshare mount namespace for inits"
...
This reverts commit b6569b6b82
.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-15 10:35:17 -07:00
Alexander Morozov
1157fcc4a4
Merge pull request #13926 from Microsoft/10662-createfixup
...
Windows: Fixup compile in daemon_windows.go
2015-06-15 10:17:24 -07:00
Sebastiaan van Stijn
637023a5f8
Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
...
Add --net=container with --publish --expose --publish-all error out
2015-06-15 16:25:59 +02:00
unclejack
6578ad90c3
docker/daemon: set umask to the default on startup
...
This sets up the umask so that it's the same on all systems.
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-06-15 16:47:20 +03:00
Asbjørn Enge
dfec4a48c7
Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-06-15 00:04:05 +02:00
Asbjørn Enge
ac8cbf4952
Updated TextMate install instruction - this bundle is not included in TM 😄 :rocket
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-06-15 00:02:10 +02:00
moxiegirl
ee40f29712
Merge pull request #13927 from moxiegirl/carry-13250
...
Carry of PR #13520
2015-06-13 10:29:56 -07:00
Tibor Vass
f27c9bc6e7
Merge pull request #13895 from calavera/fix_get_env_split
...
Correct getEnv split.
2015-06-13 12:43:45 -04:00
Mary Anthony
cd44018856
Carry of PR #13520
...
Removinig files
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-13 09:27:30 -07:00
Arnaud Porterie
cd36b15ccb
Merge pull request #13860 from jlhawn/cli_call_headers
...
api/client: have cli.call() return headers
2015-06-13 09:14:40 -07:00
John Howard
c7975f12d6
Windows: Fixup compile in daemon_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-13 09:10:54 -07:00
Arnaud Porterie
261af00282
Merge pull request #13682 from mavenugo/ln_vin
...
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
2015-06-13 09:00:33 -07:00
Doug Davis
f1ea3e5c74
Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig
...
Refactor verifyHostConfig: change to verifyConfigs and add verify config
2015-06-12 19:59:45 -07:00
Lei Jitang
b37832e353
Add verify config to verifyContainerSettings
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-06-13 09:31:19 +08:00
Arnaud Porterie
422fa7f0a6
Merge pull request #13749 from Microsoft/adduseragent
...
Add GOOS in User-Agent
2015-06-12 17:19:51 -07:00
Michael Crosby
39bf57e085
Merge pull request #13344 from hqhq/hq_fix_arm64_test
...
Fix unit-test build error on ARM64
2015-06-12 17:11:18 -07:00
Arnaud Porterie
6a7a7570bb
Merge pull request #12833 from burke/faster-changes
...
Optimize archive.ChangesDirs on Linux
2015-06-12 17:05:34 -07:00
Madhu Venugopal
083300168f
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
...
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-12 16:10:40 -07:00
Jessie Frazelle
cd71c5ed43
Merge pull request #13836 from amylindburg/master
...
Update plugins.md
2015-06-12 15:40:20 -07:00
Amy Lindburg
0a529b6e7a
Update plugins.md
...
Fixed broken link.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
Update plugins.md
Some other broken links!
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
Update plugin_api.md
FIxing broken links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
Update plugins_volume.md
Fixing more links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
2015-06-12 15:38:15 -07:00
David Calavera
421b9b6859
Merge pull request #13916 from Microsoft/10662-compileserver
...
Windows: Patch up compile after adjustCpuShares
2015-06-12 13:48:22 -07:00
John Howard
d2c5fcc8d5
Windows: Patch up compile after adjustCpuShares
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-12 13:00:59 -07:00
Tianon Gravi
9465272c28
Add new "validate-pkg" bundlescript
...
This helps ensure that `github.com/docker/docker/pkg/...` is actually safe to use in isolation (ie, doesn't import anything from `github.com/docker/docker` except other things from `pkg` or vendored dependencies).
Adding `github.com/docker/docker/utils` to the imports of `pkg/version/version.go`:
```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
These files import internal code: (either directly or indirectly)
- pkg/version/version.go imports github.com/docker/docker/autogen/dockerversion
- pkg/version/version.go imports github.com/docker/docker/utils
```
And then removing it again:
```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
Congratulations! "./pkg/..." is safely isolated from internal code.
```
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-12 12:28:23 -07:00
Antonio Murdaca
5bddafe169
Merge pull request #13912 from icecrime/13902_improve_test
...
Replace "sleep" by "top" in test implementation
2015-06-12 20:24:31 +02:00
David Calavera
e7533d7f81
Merge pull request #13494 from Microsoft/10662-vfsdriveroption
...
Windows: Allow VFS
2015-06-12 11:12:32 -07:00
Antonio Murdaca
27e2837c6c
Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp
...
Fixes content-type/length for stats stream=false
2015-06-12 19:53:18 +02:00