2d2c80b6fc
Merge pull request #13975 from stevvooe/move-setup-init-layer
...
Move graph.SetupInitLayer to daemon package where it is used
Upstream-commit: a27d8f9aa4dbdbad5bbfd83c8d8321e7a976305c
Component: engine
2015-06-16 22:37:51 -04:00
fe0ca49e61
Move graph.SetupInitLayer to daemon package where it is used
...
An inspection of the graph package showed this function to be way out of place.
It is only depended upon by the daemon code. The function prepares a top-level
readonly layer used to provide a consistent runtime environment for docker
images.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: b7f887a9a24a2df61fa53612ae42b7e9d62fe858
Component: engine
2015-06-16 16:50:56 -07:00
d527901687
Merge pull request #13685 from yuchangchun1/tag_regx
...
add a more accurate error description for invalid tag name
Upstream-commit: ba9db62e68581b2f9187b15b13150396961e23e9
Component: engine
2015-06-16 16:33:17 -07:00
c05ac2c71c
Merge pull request #13961 from unclejack/linting_changes
...
linting changes
Upstream-commit: b6531d4ec339f769a5a427cd31fb88a5c4b933e8
Component: engine
2015-06-16 15:55:18 -07:00
70a75c7cfc
linting changes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 2f6e4fdb29ba6463bfcded8e919832803d7cdbae
Component: engine
2015-06-17 01:16:57 +03:00
8810db85be
Merge pull request #13198 from rhvgoyal/extend-docker-inspect
...
docker-inspect: Extend docker inspect to export image metadata related to graph driver
Upstream-commit: e69df2589c1220217054abdc6a361b55990b3c0b
Component: engine
2015-06-16 15:03:14 -05:00
a9b211e201
Merge pull request #13970 from cpuguy83/13964_fix_tlsverify_env
...
Fix DOCKER_TLS_VERIFY being ignored
Upstream-commit: b1f984a29f3fa6b9125e38e6bbd7efa34e814159
Component: engine
2015-06-16 10:24:41 -07:00
7ea6b49842
Merge pull request #13915 from tianon/validate-pkg
...
Add new "validate-pkg" bundlescript
Upstream-commit: c80256a31d89813000b47f43b69f7b27e36e1a8c
Component: engine
2015-06-16 10:09:11 -07:00
baa23ba245
Merge pull request #13955 from jfrazelle/update-install-script-w-experimental-gpg
...
add gpg fingerprint for experimental
Upstream-commit: 952d030be228e252897a405b978394e4dfbd4fe5
Component: engine
2015-06-16 12:44:40 -04:00
48bd0d41e3
Merge pull request #13972 from tiborvass/update-go-net
...
Update vendored go.net to use golang.org/x/net canonical path
Upstream-commit: 2420ef8cf14b612e940843b93ff78a70d18e6215
Component: engine
2015-06-16 09:37:07 -07:00
932e8a3e7e
Merge pull request #13965 from cpuguy83/fix_windows_vfs_import
...
Fix circular import for windows vfs graphdriver
Upstream-commit: de6e6d4b281709033c44d197a9e46323f38928f1
Component: engine
2015-06-16 12:32:24 -04:00
69ff11d75b
Fix DOCKER_TLS_VERIFY being ignored
...
DOCEKR_TLS_VERIFY was being ignored because we were just checking if the
`-tlsverify` flag was set, not the actual value, which is defaulted to
the value of `os.Getenv("DOCKER_TLS_VERIFY") != ""`
The problem that this specifically fixes is where the client has set the
`DOCKER_TLS_VERIFY` env var but is connecting to a daemon that is not
verifed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5a6a33f7acccc7394a5ac418e777d5a6e1d1b7ed
Component: engine
2015-06-16 12:04:00 -04:00
fa9ff55406
Update vendored go.net to use golang.org/x/net canonical path
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: d820e00aac2376d4e01721557b9af5e482ec89cd
Component: engine
2015-06-16 11:40:04 -04:00
1868142b6e
Fix circular import for windows vfs graphdriver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 49834e8d5922f8c256124177b188d89007af03f6
Component: engine
2015-06-16 09:08:10 -04:00
a540cd0042
Merge pull request #13960 from yous/fix-static-file-links
...
Remove `sources/` under `docs` directory
Upstream-commit: 57aa0248af0f7c61d6484d90bfa3b503d4928aed
Component: engine
2015-06-16 05:54:23 -07:00
8758fd6f1e
Remove sources/ under docs directory
...
See #13936 .
Signed-off-by: ChaYoung You <yousbe@gmail.com >
Upstream-commit: 3f4eeca68f49a979e2d0af33a7d89bf3ceb62a73
Component: engine
2015-06-16 19:15:48 +09:00
4c3630993e
add gpg fingerprint for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 957622d452983f14bcc79443c9ff05780e1fd6bf
Component: engine
2015-06-15 18:49:22 -07:00
353eb52eac
Merge pull request #13950 from Microsoft/10662-vfsforreal
...
Windows - Really fix VFS this time
Upstream-commit: 9dffd032f43dca88e8a66685aceb21b0e00cc232
Component: engine
2015-06-15 21:41:12 -04:00
97148c67d5
Merge pull request #13953 from crosbymichael/network-mtu
...
Get Mtu from default route
Upstream-commit: b81f2ee5f20d094c13893f565ce716595c539d22
Component: engine
2015-06-15 17:13:44 -07:00
9ac0ec70e6
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 >
Upstream-commit: ff4e58ff560d864432261a68502a8a5543145fdf
Component: engine
2015-06-15 16:33:02 -07:00
4c0a7236a3
Merge pull request #13941 from unclejack/fix_umask
...
docker/daemon: set umask to the default on startup
Upstream-commit: f48fadd05c5e131757ae305693e5b3ccbc539736
Component: engine
2015-06-15 16:19:38 -07:00
3a2506bacc
Merge pull request #13947 from mavenugo/vin
...
Picking up missed out vendor files via hack/vendor.sh
Upstream-commit: 4d23f459adb26deced2843ebb223bd16b5ba3b42
Component: engine
2015-06-15 16:16:02 -07:00
6b78ff756b
Merge pull request #13935 from asbjornenge/tm_syntax_updates
...
TM syntax updates
Upstream-commit: 748814a97a0bade1375ffa9cee6009a823b6d75e
Component: engine
2015-06-15 16:12:22 -07:00
bc9e6b9254
Windows - Really fix VFS this time
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 59cfc089820f6f8a2a5f24ddfcf0fe1328c9568c
Component: engine
2015-06-15 15:09:48 -07:00
d1559e41df
Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
...
Correct the message of pause and unpause a non-running container
Upstream-commit: 835f1c91161db45ed18683b5d75685dea0c5dc2c
Component: engine
2015-06-15 23:56:32 +02:00
4cf65f9e74
Merge pull request #13869 from jlhawn/multi_line_help_usage
...
api/client: Allow for multi-line usage help
Upstream-commit: 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Component: engine
2015-06-15 14:50:17 -07:00
7262d63bf2
Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
...
Store layer digests on pull
Upstream-commit: b3b04fd85a5a44182c872a2765e6732bf9f05a39
Component: engine
2015-06-15 14:37:30 -07:00
f0cfc88b9e
Merge pull request #13936 from moxiegirl/test-tooling
...
Updated retooling for Hugo to go out with 1.7
Upstream-commit: d409b05970e686993e343d226fae5b463d872082
Component: engine
2015-06-15 13:57:12 -07:00
9a276424db
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 >
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
75ce6767dc
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 >
Upstream-commit: dcc4a14ba31ab195f97dcf264835339a1a00e8d5
Component: engine
2015-06-15 11:38:06 -07:00
8b238203a5
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
Upstream-commit: 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Component: engine
2015-06-15 11:25:35 -07:00
778f11fd97
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)
Upstream-commit: a98ea87e463383a77d7244c78c9da3ac9f2cd086
Component: engine
2015-06-15 11:08:21 -07:00
4a6f8e2e63
docker-inspect: Extend docker inspect to export image/container metadata related to graph driver
...
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.
This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 407a626be62996cd6385ea4d80e669ab83f5f04d
Component: engine
2015-06-15 14:05:10 -04:00
974ab12463
Revert "contrib/init: unshare mount namespace for inits"
...
This reverts commit b6569b6b82df4c5e29ee8f5ebd9db7e36919cefd.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d8592eaff8bddb6f29c48cc39dec70db884eda00
Component: engine
2015-06-15 10:35:17 -07:00
b4ed480d0e
Merge pull request #13926 from Microsoft/10662-createfixup
...
Windows: Fixup compile in daemon_windows.go
Upstream-commit: 1157fcc4a4e775a0b6f2dfc9c0c25fcbc453e1a8
Component: engine
2015-06-15 10:17:24 -07:00
f29d02bba3
Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
...
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
2015-06-15 16:25:59 +02:00
73b0733f08
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 >
Upstream-commit: 6578ad90c307c5500a7998819743be88f63ef2b3
Component: engine
2015-06-15 16:47:20 +03:00
77a149d3fd
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)
Upstream-commit: dfec4a48c7ac3ea4604b0a6d400109aa2004bad9
Component: engine
2015-06-15 00:04:05 +02:00
c9ef6a3684
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)
Upstream-commit: ac8cbf4952cf745207dbd966109348bbb80c9ebd
Component: engine
2015-06-15 00:02:10 +02:00
98d6dbe3a1
Merge pull request #13927 from moxiegirl/carry-13250
...
Carry of PR #13520
Upstream-commit: ee40f297122b6998e35cf0992c96dd559ea41b26
Component: engine
2015-06-13 10:29:56 -07:00
5dbd4e8b23
Merge pull request #13895 from calavera/fix_get_env_split
...
Correct getEnv split.
Upstream-commit: f27c9bc6e79db23432e84287bbeae9b307e405d0
Component: engine
2015-06-13 12:43:45 -04:00
57eb64c9c0
Carry of PR #13520
...
Removinig files
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
2015-06-13 09:27:30 -07:00
cd985d0b5e
Merge pull request #13860 from jlhawn/cli_call_headers
...
api/client: have cli.call() return headers
Upstream-commit: cd36b15ccb8561de95ee2e018baa778316da4423
Component: engine
2015-06-13 09:14:40 -07:00
e00434b7ab
Windows: Fixup compile in daemon_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c7975f12d6bcdac2812554c4d9ec88820ffe0e61
Component: engine
2015-06-13 09:10:54 -07:00
7766f90256
Merge pull request #13682 from mavenugo/ln_vin
...
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
Upstream-commit: 261af00282fac3e37d1d0018f1a926b84641625d
Component: engine
2015-06-13 09:00:33 -07:00
0088233c05
Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig
...
Refactor verifyHostConfig: change to verifyConfigs and add verify config
Upstream-commit: f1ea3e5c7462450dea4c260e4781dcc916f538da
Component: engine
2015-06-12 19:59:45 -07:00
2046248b9d
Add verify config to verifyContainerSettings
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: b37832e353327481579cbe2709f63a34453bf83b
Component: engine
2015-06-13 09:31:19 +08:00
1a52506c99
Merge pull request #13749 from Microsoft/adduseragent
...
Add GOOS in User-Agent
Upstream-commit: 422fa7f0a6c27e73125dd1f25de02198033e313e
Component: engine
2015-06-12 17:19:51 -07:00
8931d825f6
Merge pull request #13344 from hqhq/hq_fix_arm64_test
...
Fix unit-test build error on ARM64
Upstream-commit: 39bf57e085d3632b2f03b26a4b9dc900d88b164c
Component: engine
2015-06-12 17:11:18 -07:00
967010d7ff
Merge pull request #12833 from burke/faster-changes
...
Optimize archive.ChangesDirs on Linux
Upstream-commit: 6a7a7570bb50c3127931e012d19d10b8837d95ac
Component: engine
2015-06-12 17:05:34 -07:00
