clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-29 01:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,040 Commits 9 Branches 112 Tags
bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Commit Graph
16040 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 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
Sven Dowideit 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
Sven Dowideit 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
Jessie Frazelle 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
David Calavera e33aeac708 Merge pull request #13640 from Microsoft/10662-implementmeminfo 
Windows: Implement ReadMemInfo()
 2015-06-04 16:09:24 -07:00
Tianon Gravi 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
Antonio Murdaca 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
Brian Goff 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
Arnaud Porterie 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
Michael Crosby 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
Tianon Gravi 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
Alexander Morozov 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
David Calavera 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
Alexander Morozov 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
David Calavera 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
moxiegirl 4efedb3fba Merge pull request #13716 from moxiegirl/move-experimental 
Moving experimental
 2015-06-04 09:11:00 -07:00
Arnaud Porterie 9ec5e4f7df Fix kr/pty import path 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-04 09:02:14 -07:00
Zefan Li 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
Sven Dowideit 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
Alessandro Boch ea180a73bc Fix for #13720 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-06-03 23:39:27 -07:00
Jessie Frazelle 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
Arnaud Porterie 57bba29f79 Merge pull request #13732 from mavenugo/netdisabled 
Using container NetworkDisabled to fix #13725
 2015-06-03 21:40:15 -07:00
Madhu Venugopal 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
Arnaud Porterie 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
Jessie Frazelle 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
Jessica Frazelle 229b599259 fix version struct on old versions 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-03 16:56:50 -07:00
Arnaud Porterie 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
Jessie Frazelle ca66419522 Merge pull request #13709 from jfrazelle/update-url 
Update urls from .com to .org.
 2015-06-03 14:21:38 -07:00
Antonio Murdaca 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
Arnaud Porterie ad56d797d3 Merge pull request #13712 from LK4D4/fix_leak_events 
Support CloseNotifier for events
 2015-06-03 13:43:39 -07:00
Mary Anthony 95dfc4c4a5 Moving experimental 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-03 13:43:27 -07:00
Jessica Frazelle 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
Alexander Morozov fa020341e4 Update github.com/Sirupsen/logrus to 0.8.2 
Fix #13708

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-03 13:22:56 -07:00
Antonio Murdaca f18ce101fb Merge pull request #13165 from ahmetalpbalkan/durations 
Allow duration strings as --since/--until
 2015-06-03 22:14:42 +02:00
Arnaud Porterie a29633f687 Merge pull request #13703 from runcom/13691-container-ps-regression 
Do not omit empty json field in /containers/json api response
 2015-06-03 12:30:12 -07:00
Sebastiaan van Stijn b30121984e Merge pull request #13702 from BenSeverson/patch-1 
quick doc fix for windows versions
 2015-06-03 21:24:13 +02:00
David Calavera c962f53a3e Merge pull request #13645 from calavera/fix_stats_flaky_test 
Fix stats flaky test.
 2015-06-03 12:05:43 -07:00
Alexander Morozov 9e7fc245a7 Support CloseNotifier for events 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-03 11:42:51 -07:00
Ben Severson a448b7aff2 quick doc fix for windows versions 
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com>
 2015-06-03 10:28:11 -07:00
Tianon Gravi aa54a93f74 Swap build-* to use UTC instead of local time 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-03 09:56:46 -07:00
Alexander Morozov 521926f6c4 Merge pull request #13231 from Microsoft/10662-chrootarchive 
Windows: chrootarchive refactor
 2015-06-03 09:54:42 -07:00
Antonio Murdaca 725f34151c Do not omit empty json field in /containers/json api response 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-03 18:53:40 +02:00
Sebastiaan van Stijn 0636bb7b73 Merge pull request #13672 from LK4D4/syslog_tag 
Add syslog-tag option
 2015-06-03 17:04:59 +02:00
moxiegirl 641f3e0932 Merge pull request #13205 from hqhq/hq_fix_ipforward_doc 
Add docs for ip-forward
 2015-06-03 07:50:19 -07:00
Antonio Murdaca f03daf29dc Merge pull request #13696 from hqhq/hq_add_comment_inspect 
Add comment about inspect output
 2015-06-03 13:36:00 +02:00
Qiang Huang 01a9a9284f Add comment about inspect output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-06-03 17:35:57 +08:00
Qiang Huang 85fffe1341 Add docs for ip-forward 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-06-03 16:37:40 +08:00
Jessie Frazelle 63823cd6c1 Merge pull request #13683 from crosbymichael/nat-test-fixes 
Fix nat integration tests
 2015-06-02 18:54:17 -07:00
Michael Crosby 4f42097883 Fix nat integration tests 
This removes complexity of current implementation and makes the test
correct and assert the right things.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-06-02 18:21:16 -07:00
Zefan Li 8b4c0decfc Cleanup Daemon.verifyVolumesInfo() a bit 
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.

Signed-off-by: Zefan Li <lizefan@huawei.com>
 2015-06-03 09:19:16 +08:00