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
John Howard
32b905d90f
Windows: Pass store test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 12:39:43 -08:00
Alexander Morozov
4302c14a64
Merge pull request #16920 from mountkin/fix-attach-test
...
fix the flaws in the test of the attach API
2015-11-13 12:05:22 -08:00
Alexander Morozov
a4acb1db4a
Merge pull request #17615 from WeiZhang555/17404-net-inspect-name
...
Include container names in `network inspect`
2015-11-13 11:54:59 -08:00
Alexander Morozov
42fa8e3128
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
2015-11-13 11:49:54 -08:00
Darren Stahl
9db5db1b94
This fixes the case where arguments are escaped twice from Dockerfiles on
...
Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-13 10:43:06 -08:00
Mary Anthony
0a31647780
Fixing issue noted by user
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-13 10:28:51 -08:00
moxiegirl
f49fb07086
Merge pull request #17961 from pidster/add-weave-network-plugin
...
Add Weave Network Plugin to docs/extend/plugins.md
2015-11-13 10:12:58 -08:00
Alexander Morozov
cccf674943
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
Vladimir Varankin
3830359745
Simplify address formating
...
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.
Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com>
2015-11-13 20:32:32 +03:00
Antonio Murdaca
c705be8e22
Merge pull request #17955 from twhiteman/issue_17952
...
integration-cli: support remote docker host that uses TLS - fixes #17952
2015-11-13 18:26:32 +01:00
Alexander Morozov
59a341ed2a
Merge pull request #17833 from rhatdan/signals
...
Define all of the signals defined by kill -l
2015-11-13 09:03:51 -08:00
kayrus
0f2b3191d9
Added possibility to use TLS with systemd socket activation
...
Signed-off-by: kayrus <kay.diam@gmail.com>
2015-11-13 17:01:23 +01:00
Mike Brown
430d8ff611
modifying docker --since and --until to support nanoseconds and time zones
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-11-13 09:56:15 -06:00
pidster
f57073c72b
Add Weave Network Plugin to docs/extend/plugins.md
...
Signed-off-by: pidster <pid@pidster.com>
2015-11-13 10:09:22 +00:00
Sebastiaan van Stijn
02bc514fb8
Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
...
docs: update supported drivers for docker logs
2015-11-13 07:37:47 +01:00
Shekhar Gulati
4e4a68415c
added rx-docker-client library
...
Signed-off-by: Shekhar Gulati <shekhargulati84@gmail.com>
2015-11-13 08:23:57 +05:30
Brian Goff
6c27605df6
Merge pull request #17954 from LK4D4/move_utils_selinux
...
Rename daemon/utils_*.go to selinux
2015-11-12 20:06:21 -05:00
moxiegirl
c5a10b1d27
Merge pull request #17941 from s093294/patch-1
...
updated instruction to correct file path
2015-11-12 16:34:18 -08:00
moxiegirl
c8399630ca
Merge pull request #17942 from thaJeztah/speedy-boarding
...
Docs: improve caching for make docs
2015-11-12 16:33:41 -08:00
Todd Whiteman
f6a037d474
integration-cli: support remote docker host that uses TLS - fixes #17952
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-11-12 16:16:33 -08:00
Alexander Morozov
f9daecc880
Rename daemon/utils_*.go to selinux
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 15:48:41 -08:00
Vincent Demeester
588fedef4a
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
2015-11-12 21:13:09 +01:00
Vincent Demeester
318a13b0af
Merge pull request #17948 from LK4D4/splunk_windows
...
Enable Splunk logdriver for windows
2015-11-12 20:44:31 +01:00
Vincent Demeester
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
John Howard
90eac6b48b
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-12 11:08:24 -08:00
James Turnbull
ef6cb749f0
Merge pull request #17947 from Blaisorblade/patch-1
...
Replace now broken link with a "permalink"
2015-11-12 14:05:44 -05:00
Alexander Morozov
705b50850c
Enable Splunk logdriver for windows
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 10:57:21 -08:00
Vincent Demeester
b99b23ba93
Merge pull request #17929 from mqliang/hardCode
...
Removing TODO in pkg/term/windows
2015-11-12 19:56:09 +01:00
Paolo G. Giarrusso
6b02876362
Replace now broken link with a "permalink"
...
Fix #17927 .
Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-12 19:17:29 +01:00
Aaron Lehmann
64f8ee444d
Cap the amount of buffering done by BytesPipe
...
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.
Adjust tests to work with the blocking Read and Write functions.
Remove BufReader, since now its users can use BytesPipe directly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-12 10:11:29 -08:00
Tonis Tiigi
18c7c34d4b
Fix docker pull on windows
...
Exceptions for the windows base layer handling.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-12 10:04:53 -08:00
Tianon Gravi
8b9856dbd7
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
2015-11-12 09:51:36 -08:00
Vincent Demeester
ce29a8cc37
Merge pull request #17200 from maaquib/16756-integration-cli-events-test
...
Using checkers assert for integration-cli/docker_cli_events_test.go
2015-11-12 16:43:12 +01:00
David Calavera
fc36475184
Merge pull request #17898 from zelahi/16756-createtest-dockercli
...
changed if else statements to c.Asserts in docker_cli_create_test.go.
2015-11-12 07:37:29 -08:00
Sebastiaan van Stijn
06a4e5f981
Docs: improve caching for make docs
...
Use caching for all other repositories, instead
of doing a svn checkout each time.
This may result in showing outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 16:30:40 +01:00
David Calavera
8cf38b6a8b
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00