ffd74e74b1
Merge pull request #13776 from duglin/MinorVolDocEdit
...
Minor doc edit to add clarity around the --volume path format
2015-06-05 18:41:37 -07:00
f20863929b
Merge pull request #13778 from LK4D4/rename_file
...
Rename test file to have _test postfix
2015-06-05 15:43:55 -07:00
3fcf53db92
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>
2015-06-05 15:11:42 -07:00
ff9877ccc4
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>
2015-06-05 13:49:58 -07:00
7c64ed5c8c
Merge pull request #12573 from clnperez/doc-article-baseimage
...
Update doc with usage of the scratch image
2015-06-05 13:36:33 -07:00
af29aff53c
Merge pull request #13772 from icecrime/13770_image_labels_to_containers
...
Container don't inherit from image labels
2015-06-05 13:25:34 -07:00
77bd53adfe
Update doc with usage of the scratch image
...
The scratch image used to be a regular image, but as of
commit 8936789919
2015-06-05 14:47:03 -05:00
79621c7728
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>
2015-06-05 11:11:22 -07:00
5c051e2e26
Merge pull request #13767 from duglin/TweakInNetOpts
...
Remove duplicate call to net.ParseIP
2015-06-05 10:46:31 -07:00
078b8e54e4
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
2015-06-05 10:27:58 -07:00
efe5c64768
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
2015-06-05 10:16:24 -07:00
69c2f5649a
Merge pull request #13748 from icecrime/experimental_docs
...
Minor changes to experimental docs
2015-06-05 19:11:51 +02:00
0adfb908a6
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-05 09:50:30 -07:00
b180de55ca
Remove duplicate call to net.ParseIP
...
and a little cleanup
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-05 09:44:10 -07:00
bfed4b7cc3
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>
2015-06-05 12:38:38 -04:00
edb7e84ddb
Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs
...
Fix goroutine leak on logs -f with no output
2015-06-05 11:43:47 -04:00
159f5e0137
Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5
...
Bring over DHE docs updates for publishing
2015-06-05 21:07:57 +10:00
9ed2cb300b
Bring over DHE docs updates for publishing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-06-05 21:06:59 +10:00
cd1a1ee972
Merge pull request #13752 from tianon/fix-release-debs
...
Fix release script to release _both_ .deb files
2015-06-04 16:37:59 -07:00
e33aeac708
Merge pull request #13640 from Microsoft/10662-implementmeminfo
...
Windows: Implement ReadMemInfo()
2015-06-04 16:09:24 -07:00
4572329d4b
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-04 16:08:12 -07:00
a06e0bb8b4
Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output
...
registry: debugTransport should print with testing.T.Log
2015-06-05 00:42:22 +02:00
a2602c617d
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
2015-06-04 15:39:31 -07:00
0c84604f54
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>
2015-06-04 13:56:40 -07:00
b63ec6e4b1
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
2015-06-04 12:05:47 -07:00
b26428257f
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
2015-06-04 11:14:34 -07:00
7c2178b358
Merge pull request #13736 from SvenDowideit/double-the-double-the-lines
...
Tiny spelling issue in the debian control file :)
2015-06-04 11:10:55 -07:00
cbe120db58
Merge pull request #13745 from icecrime/test_import_path
...
Fix kr/pty import path in test-integration-cli
2015-06-04 10:59:37 -07:00
d8680f7beb
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>
2015-06-04 10:33:20 -07:00
8352f2e264
Rename EXPERIMENTAL.md to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-04 10:32:50 -07:00
16a5590c5b
Migrate data from old vfs paths to new local volumes path.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-04 10:16:19 -07:00
9069cded57
Merge pull request #13586 from kvasdopil/zfs-88chars
...
Avoid 88-chars mountpoint length limit on freebsd
2015-06-04 10:05:01 -07:00
2c09dbb7dd
Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir
...
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
2015-06-04 09:21:53 -07:00
4efedb3fba
Merge pull request #13716 from moxiegirl/move-experimental
...
Moving experimental
2015-06-04 09:11:00 -07:00
9ec5e4f7df
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-04 09:02:14 -07:00
d31224743b
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
...
Also remove redundant code.
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-06-04 21:26:15 +08:00
318defe1de
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-06-04 18:16:24 +10:00
ea180a73bc
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-03 23:39:27 -07:00
ef3e956aa2
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
2015-06-03 22:05:09 -07:00
57bba29f79
Merge pull request #13732 from mavenugo/netdisabled
...
Using container NetworkDisabled to fix #13725
2015-06-03 21:40:15 -07:00
83208a531d
Using container NetworkDisabled to fix #13725
...
container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725 .
There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-03 17:31:22 -07:00
f37e6e180f
Merge pull request #13731 from jfrazelle/fix-version-on-old-versions
...
fix version struct on old versions
2015-06-03 17:24:53 -07:00
fdd6175bca
Merge pull request #13718 from runcom/fix-containers-json
...
SizeRW & SizeRootFs omitted if empty in /container/json call
2015-06-03 17:14:58 -07:00
229b599259
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-03 16:56:50 -07:00
babf751e1b
Merge pull request #13715 from LK4D4/update_logrus
...
Update github.com/Sirupsen/logrus to 0.8.2
2015-06-03 14:24:37 -07:00
ca66419522
Merge pull request #13709 from jfrazelle/update-url
...
Update urls from .com to .org.
2015-06-03 14:21:38 -07:00
6945ac2d02
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-03 23:13:56 +02:00
ad56d797d3
Merge pull request #13712 from LK4D4/fix_leak_events
...
Support CloseNotifier for events
2015-06-03 13:43:39 -07:00
95dfc4c4a5
Moving experimental
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-03 13:43:27 -07:00
7943bce894
Update urls from .com to .org.
...
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-03 13:28:47 -07:00
moxiegirl
Jessie Frazelle
Doug Davis
Alexander Morozov
Christy Perez
Arnaud Porterie
Alexander Morozov
Sebastiaan van Stijn
Jessica Frazelle
Tibor Vass
Phil Estes
Sven Dowideit
Sven Dowideit
David Calavera
Tianon Gravi
Antonio Murdaca
Brian Goff
Michael Crosby
Zefan Li
Alessandro Boch
Madhu Venugopal
Antonio Murdaca