9b9105b3b2
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8b02d85e1728b48729b2fb8553b2ec4b56a30d37
Component: engine
2015-03-23 20:58:16 +01:00
7e56dcc56b
Merge pull request #11648 from ahmetalpbalkan/win-cli/ansi-emulation-check
...
Disable ANSI emulation in certain windows shells
Upstream-commit: b0946775595692efa5a9ca92a2b27cf2b617e28a
Component: engine
2015-03-23 12:55:31 -07:00
974bfa30e6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
Upstream-commit: 2717302cc69c865cfec02fb48b3cb173d6980364
Component: engine
2015-03-23 12:32:26 -07:00
f3e52eec93
Merge pull request #11653 from runcom/11649-syslog-refactor-log-else-clause
...
Refactor syslog Log else clause
Upstream-commit: ec27b77dc2b3d8560a0d224f84c96d63648a3746
Component: engine
2015-03-23 12:29:35 -07:00
84d2a9e3ec
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e600df2d9732b8c40d056563e361ded6cd5ce773
Component: engine
2015-03-23 20:03:24 +01:00
1ef60888a8
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8f025aae36fd040d8d2617890b258b5460ae44db
Component: engine
2015-03-23 20:01:01 +01:00
f24a24db53
make.sh: leave around the generated version
...
For positerity (largely of packagers) lets leave around the generated
version files that happen during build.
They're already ignored in git, and recreated on every build.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 3a939d99870eaad34aea2010b64147a1e60bb3c5
Component: engine
2015-03-23 14:46:44 -04:00
30a3ccd5cd
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 >
Upstream-commit: b38ff8c83d82b7958c62c07a8b82e4b85f0311c0
Component: engine
2015-03-23 18:38:43 +00:00
dad3640059
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
2015-03-23 11:34:33 -07:00
69bd180001
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
2015-03-23 13:30:11 -05:00
7dfdb9ea11
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
Upstream-commit: 85ab3c3b49f902a3e0837e52ab3ce8fdfa2c8e5b
Component: engine
2015-03-23 11:21:16 -07:00
2ae5f5eb68
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
2ed910fd38
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
8814588380
Merge pull request #10347 from unclejack/bufreader_reset
...
reset bufReader to avoid extreme growth of buffers
Upstream-commit: c4603de56a635086772364af52a62548ad15c2fc
Component: engine
2015-03-23 10:07:43 -07:00
950464de97
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
53a187728a
Merge pull request #11574 from icecrime/release_version_push
...
Document VERSION file update scheme
Upstream-commit: bf304cc414c98830a4d98cb6b7f253e9397b9813
Component: engine
2015-03-23 09:47:16 -07:00
31ae66ceae
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 5daa9260bcef2a47c493adc04e6638c9d200a9cf
Component: engine
2015-03-23 16:45:48 +00:00
2d5a6d9e9b
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d124197cc726a3b69cc3cde8c4d560f3f0e1af9c
Component: engine
2015-03-23 13:03:31 +01:00
4b8e196164
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
4361d07cff
Refactors pkg/testutils
...
Solves #11579 .
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: 5de1e7bc3a823e1a4fa35ddf75401d233b3e4692
Component: engine
2015-03-22 22:31:46 -07:00
a1d0fa6752
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
9dcfa784ef
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
Upstream-commit: ded0ada9b47ab48b57d14225ec663e3756faff7f
Component: engine
2015-03-22 19:25:50 -07:00
088f0e2cb3
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
d411e326ae
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
2015-03-22 19:14:34 -07:00
0485dd2e93
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
2015-03-22 19:13:38 -07:00
e24a7c417e
Merge pull request #11062 from misterbisson/joyentinstall
...
Installation on Joyent
Upstream-commit: 19295cb37b56648008c2d26bc86e9589a643d1a4
Component: engine
2015-03-23 12:07:49 +10:00
4b3632f9e6
Merge pull request #11532 from dmcgowan/fix-v1-404-issue-11510
...
Add check for 404 on get repository data
Upstream-commit: 126539540607887b6f1bec4559dfa60c0ae562e5
Component: engine
2015-03-22 18:57:35 -07:00
c6792796c3
Document VERSION file update scheme
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f07ac12791e4af7f199a893705204481588062ae
Component: engine
2015-03-22 18:45:01 -07:00
bac420baa9
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
7cd85af5c7
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 >
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
4b295342e5
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)
Upstream-commit: c8d2ec93caf7c64f3e510e4e75f49614880ed9b9
Component: engine
2015-03-22 18:15:18 -07:00
5ba6e61a95
Merge pull request #11553 from Sirupsen/update-logrus-71
...
vendor: update logrus to 0.7.1
Upstream-commit: 01506d13fac29b2b340150c4cf01b1e14430f405
Component: engine
2015-03-22 18:11:17 -07:00
7d0f834cb3
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
2015-03-23 11:01:28 +10:00
67fed9c55e
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 33448ac3c9c0c63fb07f7bf04cec998d3536fc10
Component: engine
2015-03-22 17:56:05 -07:00
addc7158f4
Merge pull request #11572 from tiborvass/skip-hello-world-test
...
Skip TestPullVerified because hello-world image cannot be verified
Upstream-commit: 48a954f4b3af4602a2efcbc3e5ba963ce25091d6
Component: engine
2015-03-22 20:09:55 -04:00
2b2e612495
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
2015-03-23 10:03:00 +10:00
503af64bfc
Skip TestPullVerified because hello-world image cannot be verified
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: df389df9904dc1585160d7992c6f3dc150490e05
Component: engine
2015-03-22 19:34:40 -04:00
5b307a9ba4
winconsole: cleanup
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 01a43174dae3b88e264f3139e1a4bf7ee666957f
Component: engine
2015-03-22 15:47:54 -04:00
112ea1d359
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.
Upstream-commit: 4abc0fcf595d6355866f1c074feb5d96ac734861
Component: engine
2015-03-22 12:21:12 -07:00
e1ebdbecb2
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 >
Upstream-commit: fdbec264111ac20b06cdd9b885fe47415a6495e4
Component: engine
2015-03-22 11:55:32 -07:00
6bc6946799
Merge pull request #11567 from draghuram/contrib-docs
...
Fix typo in git setup doc.
Upstream-commit: b485d3dfa72b5574d9f0dc6346e504cc18a0e6ba
Component: engine
2015-03-22 11:31:00 -04:00
9e9a6a8f56
Fix typo in git setup doc.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: f5c60fc0fd4e0daa068134ab9a887f69c797bae7
Component: engine
2015-03-22 11:22:47 -04:00
7c1bfa9093
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 >
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
2015-03-22 11:31:28 +00:00
c88ab1e8ac
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 >
Upstream-commit: 3a33bff7fdd96705e761bb1f1750cfa6f4df4070
Component: engine
2015-03-22 02:06:50 +00:00
d2583ecaca
Clarifying structure in light of Kitematic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f3b7bf9682c10cdd6dfbdca79080790d7411c1b7
Component: engine
2015-03-21 18:20:25 -07:00
a7d21898b0
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com >
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
2015-03-21 18:01:18 -07:00
3e27a02d3e
Merge pull request #11546 from moxiegirl/bday-edits-before
...
Update contributor docs and triage to match new labeling system
Upstream-commit: e40fc2f0385353c0e62b17a3653992592ea571b6
Component: engine
2015-03-21 16:25:10 -07:00
8fb2e38bd2
Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces
...
integ-cli: fix bug and race in TestBuildSpaces
Upstream-commit: 4c443facf452903b01f337a4a19ad07d646b3835
Component: engine
2015-03-21 19:20:17 -04:00
3e6a579992
Update contributor docs and triage to match new labeling system
...
Add clarification around experience
Adding test
improvement > enhancement
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
2015-03-21 15:55:33 -07:00
8a89ab91de
Merge pull request #11454 from hqhq/fix_memoryswap_warning
...
do not warning when we disable memoryswap
Upstream-commit: b6e20a67f915c8be0b2829742ab32dea3d342905
Component: engine
2015-03-21 15:23:25 -07:00
