Commit Graph

19929 Commits

Author SHA1 Message Date
David Calavera 6f1bc096a6 Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
Windows: Fix docker exec
2015-11-17 11:14:54 +01:00
David Calavera a2d87d14ac Merge pull request #18037 from dm4/fix-aufs-markdown-syntax
Fix Markdown syntax error in aufs-driver.md
2015-11-17 11:13:01 +01:00
Lee, Meng-Han ea04764059 Fix Markdown syntax error in aufs-driver
Signed-off-by: dm4 <dm4@skymizer.com>
2015-11-17 17:38:36 +08:00
Tibor Vass ef424c108a Merge pull request #17988 from Microsoft/jjh/pushv2
Windows [TP4] Fix push to not kill daemon
2015-11-17 01:28:34 +01:00
Darren Stahl d7692b02bd Typo in previous PR processConfig, not c.ProcessConfig
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-16 11:56:01 -08:00
Alexander Morozov a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
moxiegirl 4b706195d2 Merge pull request #17515 from azurezk/fixdoc
fix doc of volume name conflict
2015-11-16 09:15:50 -08:00
Sebastiaan van Stijn e88ffba2ec Merge pull request #18016 from moxiegirl/carry-17453
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
2015-11-16 17:35:04 +01:00
Sebastiaan van Stijn 7c5cdda74e Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
fix the bug: cpu percent will extremely high
2015-11-16 17:26:29 +01:00
Andre Granovsky be2152116c docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
Adjusted as per comment.
Rebase and squash by moxigirl

Signed-off-by: Andre Granovsky <robotciti@live.com>
2015-11-16 08:24:26 -08:00
Tibor Vass 92487d7fb4 Merge pull request #17985 from Microsoft/jjh/firstboot
Windows: [TP4] Fix regression on second or later container starts
2015-11-16 10:03:46 +01:00
Vincent Demeester 3b1acde99b Merge pull request #17995 from albers/completion--volume-driver
bash completion for `docker {run,create} --volume-driver`
2015-11-16 04:40:20 +01:00
Harald Albers d411c47139 bash completion for `docker {run,create} --volume-driver`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-15 09:53:22 -08:00
John Howard 7e5e29e415 Windows [TP4] Fix push to not kill daemon
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-15 08:43:23 -08:00
Zhang Kun 82ba25bea9 fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-11-15 23:32:40 +08:00
Tibor Vass 59fe485f0d Merge pull request #17945 from tonistiigi/fix-windows-pull
Fix docker pull on windows
2015-11-15 12:32:25 +01:00
Sebastiaan van Stijn cf824d9749 Merge pull request #17479 from coolljt0725/show_warning
Show warning when user specify dm.basesize for already initialized devicemapper driver
2015-11-15 08:51:33 +01:00
Tibor Vass 586152523d Merge pull request #17987 from jfrazelle/correct-ltdl
Correct ltdl and fix experimental macro for rpms
2015-11-15 03:46:23 +01:00
Jessica Frazelle 38724c80ab
fix experimental boolean macro
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 14:47:13 -08:00
Vincent Demeester 31a6e01f47 Merge pull request #17009 from azurezk/user-checkers
add c.Assert in docker_cli_ps_test.go
2015-11-14 20:22:15 +01:00
John Howard 8da449055f Windows: Fix regresion on first boot
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-14 11:06:19 -08:00
Alexander Morozov fb77b822ad Merge pull request #17758 from rhatdan/dynbinary
Since default is dynbinary we should test with dynbinary
2015-11-14 10:54:03 -08:00
Jessica Frazelle 41619f4a90
correct ltdl for centos
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 08:50:58 -08:00
Antonio Murdaca ad8a66573c Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
Prevent double escaping of Dockerfile commands on Windows
2015-11-14 17:25:53 +01:00
Arnaud Porterie 7a6f2cdeeb Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
New version of notary with pkcs11 client integration
2015-11-14 12:03:29 +01:00
Dan Walsh 0d47b74a7f Since default is dynbinary we should test with dynbinary
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-14 06:01:55 -05:00
Antonio Murdaca 1448cd3ec2 Merge pull request #17971 from narqo/simplify-addr-formating
Simplify final address formatting in parser.ParseTCPAddr
2015-11-14 08:38:09 +01:00
Antonio Murdaca dc136b710b Merge pull request #17211 from endocode/kayrus/docker_fd_https
Added possibility to use TLS with systemd socket activation
2015-11-14 08:36:54 +01:00
Michael Crosby 1f53bf9097 Merge pull request #17859 from liusdu/remove-rebundent
remove unnecessary logs from daemon
2015-11-13 16:45:30 -08:00
Michael Crosby 7e0a5398af Merge pull request #17976 from Microsoft/jjh/store-test-unit
Windows: Pass store test-unit
2015-11-13 16:26:17 -08:00
Alexander Morozov 9b307fe369 Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories
putting in support for rmi id for legacy docker.io/name images in loc…
2015-11-13 16:22:30 -08:00
Michael Crosby 439633cee6 Merge pull request #17977 from Microsoft/jjh/archivewindowscomment
Windows: Fixes comment in archive_windows.go
2015-11-13 16:00:14 -08:00
Michael Crosby 28612c5587 Merge pull request #17978 from Microsoft/jjh/removevolumecheck
Windows: Remove check for volume support
2015-11-13 15:59:41 -08:00
Michael Crosby 58244392e5 Merge pull request #17979 from Microsoft/jjh/tidytodowindows
Remove 'TODO Windows' unnecessary comment
2015-11-13 15:59:06 -08:00
unclejack 13963957eb Merge pull request #17877 from aaronlehmann/capped-bytespipe
Cap the amount of buffering done by BytesPipe
2015-11-14 00:51:11 +02:00
Alexander Morozov 5e2d4aaec2 Merge pull request #17980 from Microsoft/jjh/configuresysinit
Remove uncalled configureSysInit
2015-11-13 14:30:03 -08:00
Alexander Morozov f5e318a17b Merge pull request #17090 from duglin/dockerignoreWildcards
Support multi-dir wildcards in .dockerignore
2015-11-13 14:29:34 -08:00
Doug Davis a5f3ed4801 Merge pull request #17599 from perhapszzy/master
Add line information in the parsed Dockerfile.
2015-11-13 16:53:59 -05:00
Doug Davis eddb14a44e Support multi-dir wildcards in .dockerignore
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-13 13:44:07 -08:00
John Howard 2648655a4a Remove uncalled configureSysInit
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:43:09 -08:00
David Lawrence 52021ac2a4
fixing tests for updated CLI output
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-11-13 13:20:55 -08:00
Jessica Frazelle 6c818f3e5f
update for mac
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:54 -08:00
Jessica Frazelle cf4c3da725
update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
Jessica Frazelle 141369457f
add buildtag pkcs11 to experimental
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:49 -08:00
Jessica Frazelle 94ea6af8cd
update vendor.sh and notary api for vendored changes
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:11 -08:00
Jessica Frazelle a52a7a6991
update notary vendors
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:09 -08:00
John Howard 208ad80605 Remove TODO Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:07:27 -08:00
John Howard 8209571982 Windows: Remove check for volume support
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:02:30 -08:00
John Howard e5261d6e4a Windows: Fixes comment
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 12:51:05 -08:00
perhapszzy@sina.com 5b6c4dd3df Add line information in the parsed Dockerfile
Signed-off-by: perhapszzy@sina.com <perhapszzy@sina.com>
2015-11-13 15:41:12 -05:00