4d366ead20
Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 67552fb22d254ba5e515aa899b1da3173f474a14
Component: engine
2015-06-08 09:06:58 +08:00
f5234e7cf7
Merge pull request #13795 from michael-k/daemonFolder
...
[integration-cli] Made doc consistent with code
Upstream-commit: 5d22afc54e21677dc3bf5e0f0283aff9d8892701
Component: engine
2015-06-07 16:57:54 -04:00
42682fb818
Made doc consistent with code
...
The name of the folder was shortened in a1ea562
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de >
Upstream-commit: 54ac3d9c76df3bbbb54b85b58a503cc1d6155f01
Component: engine
2015-06-07 22:32:29 +02:00
8eb50c9051
Merge pull request #13787 from runcom/check-nil-Config
...
Avoid nil pointer dereference while creating a container with an empty Config
Upstream-commit: 07b22fcf50f0156a5a15d5392a7dcb340b493f34
Component: engine
2015-06-07 12:28:41 -04:00
6726a8ab9a
Merge pull request #13791 from eolamey/minor-docs-fixes
...
Fix a typo and a minor formatting issue in the docs.
Upstream-commit: 3c37a307bcd67bbb3f1b0333dd30eb45b1650492
Component: engine
2015-06-07 09:25:15 -04:00
b9079beed3
Fix a typo and a minor formatting issue in the docs.
...
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 173d0918a8ddffe1ba8a057527feccb6bee7f30b
Component: engine
2015-06-07 12:49:03 +00:00
34bcda9fbc
Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please
...
Restore --default-gateway{,-v6} daemon options.
Upstream-commit: 3d10540bc330ec0a99229e2a943ae04a0f8b38c9
Component: engine
2015-06-06 16:02:59 -07:00
6aab6b5654
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
2015-06-06 20:07:32 +02:00
ddadb07458
Merge pull request #13764 from bcexelbi/bexelbie_man_typo
...
Fixing typo in Dockerfile manpage
Upstream-commit: 3c132ff62d49247abed25a5686611bcac6801b23
Component: engine
2015-06-06 08:50:27 -04:00
3f884b5df5
Merge pull request #13776 from duglin/MinorVolDocEdit
...
Minor doc edit to add clarity around the --volume path format
Upstream-commit: ffd74e74b19cf402f7d9a98fe77790c4a79655da
Component: engine
2015-06-05 18:41:37 -07:00
43bd2efd7c
Merge pull request #13778 from LK4D4/rename_file
...
Rename test file to have _test postfix
Upstream-commit: f20863929b3ca7c6a2735200404ec8af8fd6ebbf
Component: engine
2015-06-05 15:43:55 -07:00
21f31995a1
Minor doc edit to add clarity around the --volume path format
...
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3fcf53db920de9d9111a86bd0eda90a059885754
Component: engine
2015-06-05 15:11:42 -07:00
ffc2b1eb23
Rename test file to have _test postfix
...
Without this go test was unable to find line number of error in that
file.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ff9877ccc4db4d0891583ebac6558a235b028942
Component: engine
2015-06-05 13:49:58 -07:00
68316f4f57
Merge pull request #12573 from clnperez/doc-article-baseimage
...
Update doc with usage of the scratch image
Upstream-commit: 7c64ed5c8c49d786d626f6a4704d868ae4662374
Component: engine
2015-06-05 13:36:33 -07:00
f43a943abe
Merge pull request #13772 from icecrime/13770_image_labels_to_containers
...
Container don't inherit from image labels
Upstream-commit: af29aff53c95ed2a478693b566cc93c19362cce8
Component: engine
2015-06-05 13:25:34 -07:00
f298ea7477
Update doc with usage of the scratch image
...
The scratch image used to be a regular image, but as of
commit 8936789919c5c8004f346f44a3452d1521818b60 it is a
special case, and cannot be used with 'docker pull.'
Update this doc to reflect the new behavior and clear up
confusion surrounding this image.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 77bd53adfe6877acd1ff8f07cf148f1dbe0b425d
Component: engine
2015-06-05 14:47:03 -05:00
4dfff4ae36
Container don't inherit from image labels
...
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.
It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.
Fixes #13770 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 79621c7728ab83292ffd94d005f10ccebfba055b
Component: engine
2015-06-05 11:11:22 -07:00
52a74c1bf3
Merge pull request #13767 from duglin/TweakInNetOpts
...
Remove duplicate call to net.ParseIP
Upstream-commit: 5c051e2e263955788809819c37a4a3b9142247ed
Component: engine
2015-06-05 10:46:31 -07:00
bc7977060e
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
Upstream-commit: 078b8e54e4429f838ff26ddace34854167fe0b42
Component: engine
2015-06-05 10:27:58 -07:00
1ddffd6be6
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
Upstream-commit: efe5c647684d8050ed174e0984d07de0f8489bbd
Component: engine
2015-06-05 10:16:24 -07:00
9ab702314a
Merge pull request #13748 from icecrime/experimental_docs
...
Minor changes to experimental docs
Upstream-commit: 69c2f5649a135835d5ea8e519a4f1b37f9d7127f
Component: engine
2015-06-05 19:11:51 +02:00
9eb2d545d0
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0adfb908a682e679b54f511fe89e668d6e676dda
Component: engine
2015-06-05 09:50:30 -07:00
325dbaa39c
Remove duplicate call to net.ParseIP
...
and a little cleanup
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b180de55caa382fd6ced4488d68392edd1d34da0
Component: engine
2015-06-05 09:44:10 -07:00
01de0478de
Refactor TLS code with a new tlsconfig package
...
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.
The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.
On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Component: engine
2015-06-05 12:38:38 -04:00
130b3e7cb1
Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs
...
Fix goroutine leak on logs -f with no output
Upstream-commit: edb7e84ddbe8df4767e7249c76551ce69d68e8f4
Component: engine
2015-06-05 11:43:47 -04:00
8263a87e8d
Fixing typo in Dockerfile manpage
...
Signed-off-by: Brian Exelbierd <bex@pobox.com >
Upstream-commit: d32e01be1ae7e72b4d9e4a6aeb462c60a8dc299c
Component: engine
2015-06-05 16:33:11 +02:00
bc52a0bc7d
Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5
...
Bring over DHE docs updates for publishing
Upstream-commit: 159f5e01377bd55d3bbc63dea759afb5503542b4
Component: engine
2015-06-05 21:07:57 +10:00
f4b07b21ea
Bring over DHE docs updates for publishing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9ed2cb300b255842a3d318a112784b806c1bf8e7
Component: engine
2015-06-05 21:06:59 +10:00
9644714f56
Restore --default-gateway{,-v6} daemon options.
...
This was added before the libnetwork merge, and then lost. Fixes #13755 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Component: engine
2015-06-05 06:21:22 +00:00
87aa2e6ea1
Merge pull request #13752 from tianon/fix-release-debs
...
Fix release script to release _both_ .deb files
Upstream-commit: cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Component: engine
2015-06-04 16:37:59 -07:00
877de25418
Merge pull request #13640 from Microsoft/10662-implementmeminfo
...
Windows: Implement ReadMemInfo()
Upstream-commit: e33aeac70892b2088442fc146fb16ab59b4eb58c
Component: engine
2015-06-04 16:09:24 -07:00
605f84f177
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4572329d4b1d7b4f9cb638961a299f79443506bb
Component: engine
2015-06-04 16:08:12 -07:00
649fae7e21
Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output
...
registry: debugTransport should print with testing.T.Log
Upstream-commit: a06e0bb8b49819402180331d325d919f865a5fbd
Component: engine
2015-06-05 00:42:22 +02:00
02d7f238fb
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
Upstream-commit: a2602c617d0afcf829983c46abd9cc95f2003078
Component: engine
2015-06-04 15:39:31 -07:00
3ebd8c1a62
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
2015-06-04 13:56:40 -07:00
de132e9aef
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
Upstream-commit: b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Component: engine
2015-06-04 12:05:47 -07:00
6f075808ca
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
Upstream-commit: b26428257f211f21f0f93d27d0ea74531cda9047
Component: engine
2015-06-04 11:14:34 -07:00
c9c1615d1c
Merge pull request #13736 from SvenDowideit/double-the-double-the-lines
...
Tiny spelling issue in the debian control file :)
Upstream-commit: 7c2178b3582729489f09fdce6aee28d2238ac047
Component: engine
2015-06-04 11:10:55 -07:00
28c1c16a45
Merge pull request #13745 from icecrime/test_import_path
...
Fix kr/pty import path in test-integration-cli
Upstream-commit: cbe120db587cddc8af9885e9ff2f2a69040deb4e
Component: engine
2015-06-04 10:59:37 -07:00
d0345d3113
Remove reference to experimental release
...
Remove reference to experimental releases as it is really a nightly
channel rather than a scheduled release.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: d8680f7beb84b036d2122739eda9ea79809a6f25
Component: engine
2015-06-04 10:33:20 -07:00
64b14be617
Rename EXPERIMENTAL.md to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 8352f2e26451549217fa52fe03f8df556af3d8ca
Component: engine
2015-06-04 10:32:50 -07:00
148ef92617
Migrate data from old vfs paths to new local volumes path.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 16a5590c5be4be555a1ebe52d031d4e9e0e6da23
Component: engine
2015-06-04 10:16:19 -07:00
3ff75591ad
Merge pull request #13586 from kvasdopil/zfs-88chars
...
Avoid 88-chars mountpoint length limit on freebsd
Upstream-commit: 9069cded5761de31b786d70f269fa47732e3e5ed
Component: engine
2015-06-04 10:05:01 -07:00
a2241b3c00
Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir
...
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
Upstream-commit: 2c09dbb7ddab685d52a2748e6f78fc8e90ad4469
Component: engine
2015-06-04 09:21:53 -07:00
dc2974419c
Merge pull request #13716 from moxiegirl/move-experimental
...
Moving experimental
Upstream-commit: 4efedb3fba49623de562b189a145c8334eaba609
Component: engine
2015-06-04 09:11:00 -07:00
cd63c659d6
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9ec5e4f7df15f5c1e9862f71fe3079188fff0106
Component: engine
2015-06-04 09:02:14 -07:00
10ccc11e11
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
...
Also remove redundant code.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: d31224743b31b3e29ed7df0835193ff1ac4e723c
Component: engine
2015-06-04 21:26:15 +08:00
e4dcd8eb99
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 318defe1de8a9d2930d784306fd024c59e21a8c5
Component: engine
2015-06-04 18:16:24 +10:00
bda4b578b4
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ea180a73bc00491915d620c14877318cc33b2a73
Component: engine
2015-06-03 23:39:27 -07:00
4e0d41c20f
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
Upstream-commit: ef3e956aa2c8b24fd18c7fa693b366be781fc30a
Component: engine
2015-06-03 22:05:09 -07:00
