9f894c93e4
Merge pull request #11658 from 4gh/doc_package_builder
...
Add builder/evaluator comments for the package in godoc-style
2015-03-23 14:27:23 -07:00
ccd4181d10
Merge pull request #11545 from cpuguy83/remove_allocator_warning
...
Don't warn when ip_local_port_range not found
2015-03-23 14:19:57 -07:00
d852e5fde8
Merge pull request #11660 from paulbellamy/11626-portallocator
...
Refactoring portallocator away from a global var
2015-03-23 14:10:56 -07:00
a0cd004528
Add builder/evaluator comments for the package in godoc-style
...
fixes #11617
Signed-off-by: Frank Herrmann <fgh@4gh.tv>
2015-03-23 20:56:03 +00:00
1257679876
Refactor global portallocator state into a global struct
...
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
2015-03-23 20:41:41 +00:00
8e4d9f3cf9
Improve err message when parsing kernel port range
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-23 13:29:25 -07:00
bc73f0ea4c
Merge pull request #11656 from runcom/11611-builder-evaluator-remove-hardcoded-error
...
Remove hardcoded error from builder/evaluator.go
2015-03-23 13:25:08 -07:00
8b02d85e17
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 20:58:16 +01:00
b094677559
Merge pull request #11648 from ahmetalpbalkan/win-cli/ansi-emulation-check
...
Disable ANSI emulation in certain windows shells
2015-03-23 12:55:31 -07:00
2717302cc6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
2015-03-23 12:32:26 -07:00
ec27b77dc2
Merge pull request #11653 from runcom/11649-syslog-refactor-log-else-clause
...
Refactor syslog Log else clause
2015-03-23 12:29:35 -07:00
e600df2d97
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 20:03:24 +01:00
8f025aae36
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 20:01:01 +01:00
b38ff8c83d
Disable ANSI emulation in certain windows shells
...
This disables recently added ANSI emulation feature in certain Windows
shells (like ConEmu) where ANSI output is emulated by default with builtin
functionality in the shell.
MSYS (mingw) runs in cmd.exe window and it doesn't support emulation.
Cygwin doesn't even pass terminal handles to docker.exe as far as I can
tell, stdin/stdout/stderr handles are behaving like non-TTY. Therefore not
even including that in the check.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-23 18:38:43 +00:00
65e21f5703
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
2015-03-23 11:34:33 -07:00
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
85ab3c3b49
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
2015-03-23 11:21:16 -07:00
1fe55b2f8b
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
2015-03-23 10:43:02 -07:00
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
c4603de56a
Merge pull request #10347 from unclejack/bufreader_reset
...
reset bufReader to avoid extreme growth of buffers
2015-03-23 10:07:43 -07:00
56acb1aac8
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
2015-03-23 09:59:40 -07:00
bf304cc414
Merge pull request #11574 from icecrime/release_version_push
...
Document VERSION file update scheme
2015-03-23 09:47:16 -07:00
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-23 12:10:22 +08:00
ded0ada9b4
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
2015-03-22 19:25:50 -07:00
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
0b63b343e8
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
2015-03-22 19:14:34 -07:00
0926a023d6
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
2015-03-22 19:13:38 -07:00
19295cb37b
Merge pull request #11062 from misterbisson/joyentinstall
...
Installation on Joyent
2015-03-23 12:07:49 +10:00
1265395406
Merge pull request #11532 from dmcgowan/fix-v1-404-issue-11510
...
Add check for 404 on get repository data
2015-03-22 18:57:35 -07:00
f07ac12791
Document VERSION file update scheme
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-22 18:45:01 -07:00
e09ead98ef
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
2015-03-22 18:21:32 -07:00
a71d89d041
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Reolved conflict in:
docs/mkdocs.yml
Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
2015-03-22 18:19:27 -07:00
c8d2ec93ca
Add check for 404 on get repository data
...
No longer add the body to the error when a 404 is received on get repository data.
closes #11510
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-03-22 18:15:18 -07:00
01506d13fa
Merge pull request #11553 from Sirupsen/update-logrus-71
...
vendor: update logrus to 0.7.1
2015-03-22 18:11:17 -07:00
cce196d64b
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
2015-03-23 11:01:28 +10:00
33448ac3c9
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-22 17:56:05 -07:00
48a954f4b3
Merge pull request #11572 from tiborvass/skip-hello-world-test
...
Skip TestPullVerified because hello-world image cannot be verified
2015-03-22 20:09:55 -04:00
cf7d093e17
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
2015-03-23 10:03:00 +10:00
df389df990
Skip TestPullVerified because hello-world image cannot be verified
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-22 19:34:40 -04:00
01a43174da
winconsole: cleanup
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-22 15:47:54 -04:00
4abc0fcf59
Merge pull request #11222 from moxiegirl/update-howto-docs
...
Updating in light of new contributors guide. Got verbal ok from Jess to pull janky is acting janky.
2015-03-22 12:21:12 -07:00
fdbec26411
Updating in light of new contributors guide
...
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-22 11:55:32 -07:00
b485d3dfa7
Merge pull request #11567 from draghuram/contrib-docs
...
Fix typo in git setup doc.
2015-03-22 11:31:00 -04:00
f5c60fc0fd
Fix typo in git setup doc.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-03-22 11:22:47 -04:00
671c12204c
Implement build cancellation
...
Add the capability to cancel the build by disconnecting the client.
This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.
This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.
* Add documentation of cancellation to cli and API
* Protect job cancellation with sync.Once
* Add TestBuildCancelationKillsSleep
* Add test case for build cancellation of RUN statements.
Signed-off-by: Peter Waller <p@pwaller.net>
2015-03-22 11:31:28 +00:00
3a33bff7fd
vendor: update logrus to 0.7.1
...
Changes relevant for Docker since 0.6.6 are (most other changes are hooks and
options for formatters):
* Debugging color output changed to gray.
* Don't quote the number 9 when it's by it self (i.e. `omg=9` instead of
`omg="8"`, this was the case for all other numbers)
* Performance is better when running a high logging level with lots of low-level
logging.
* Minor internal refactoring and more tests.
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
2015-03-22 02:06:50 +00:00
f3b7bf9682
Clarifying structure in light of Kitematic
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-21 18:20:25 -07:00
eaecd8b1b5
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com>
2015-03-21 18:01:18 -07:00
e40fc2f038
Merge pull request #11546 from moxiegirl/bday-edits-before
...
Update contributor docs and triage to match new labeling system
2015-03-21 16:25:10 -07:00
4c443facf4
Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces
...
integ-cli: fix bug and race in TestBuildSpaces
2015-03-21 19:20:17 -04:00
Alexander Morozov
Jessie Frazelle
Frank Herrmann
Paul Bellamy
Brian Goff
Antonio Murdaca
Ahmet Alp Balkan
Tibor Vass
Mabin
Arnaud Porterie
moxiegirl
Sven Dowideit
Casey Bisson
Derek McGowan
Doug Davis
Tibor Vass
Mary Anthony
Raghuram Devarakonda
Peter Waller
Simon Eskildsen
Mary Anthony
sidharthamani