0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13986 commits 14 branches 412 tags 338 MiB
Commit graph

13986 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
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
Antonio Murdaca
8f025aae36 Refactor syslog Log else clause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:01:01 +01:00
Alexander Morozov
65e21f5703 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
 2015-03-23 11:34:33 -07:00
Tibor Vass
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
Jessie Frazelle
85ab3c3b49 Merge pull request #11573 from icecrime/11572-restore_pull_test 
Restore TestPullVerified test
 2015-03-23 11:21:16 -07:00
Jessie Frazelle
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
Alexander Morozov
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
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
bf304cc414 Merge pull request #11574 from icecrime/release_version_push 
Document VERSION file update scheme
 2015-03-23 09:47:16 -07:00
Mabin
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
Arnaud Porterie
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
Jessie Frazelle
45ee402a63 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
 2015-03-22 19:16:23 -07:00
moxiegirl
0b63b343e8 Merge pull request #11505 from lloydde/doc-ref-run-it 
doc: reference/run introduce -it .
 2015-03-22 19:14:34 -07:00
moxiegirl
0926a023d6 Merge pull request #11550 from moxiegirl/adjust-mac-install 
Clarifying structure in light of Kitematic
 2015-03-22 19:13:38 -07:00
Sven Dowideit
19295cb37b Merge pull request #11062 from misterbisson/joyentinstall 
Installation on Joyent
 2015-03-23 12:07:49 +10:00
Arnaud Porterie
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
Arnaud Porterie
f07ac12791 Document VERSION file update scheme 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-22 18:45:01 -07:00
Arnaud Porterie
e09ead98ef Merge pull request #11566 from tiborvass/carry-10864 
Carry 10864: ANSI terminal emulation for windows
 2015-03-22 18:21:32 -07:00
Casey Bisson
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
Derek McGowan
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
Jessie Frazelle
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
Sven Dowideit
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
Arnaud Porterie
33448ac3c9 Restore TestPullVerified test 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-22 17:56:05 -07:00
Doug Davis
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
Sven Dowideit
cf7d093e17 Merge pull request #11400 from ahmetalpbalkan/docs/azure 
docs: Add Microsoft Azure installation instructions
 2015-03-23 10:03:00 +10:00
Tibor Vass
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
Tibor Vass
01a43174da winconsole: cleanup 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-03-22 15:47:54 -04:00
moxiegirl
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
Mary Anthony
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
Doug Davis
b485d3dfa7 Merge pull request #11567 from draghuram/contrib-docs 
Fix typo in git setup doc.
 2015-03-22 11:31:00 -04:00
Raghuram Devarakonda
f5c60fc0fd Fix typo in git setup doc. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-03-22 11:22:47 -04:00
Peter Waller
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
Simon Eskildsen
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
Mary Anthony
f3b7bf9682 Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-21 18:20:25 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Jessie Frazelle
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
Doug Davis
4c443facf4 Merge pull request #11543 from ahmetalpbalkan/TestBuildSpaces 
integ-cli: fix bug and race in TestBuildSpaces
 2015-03-21 19:20:17 -04:00
Mary Anthony
3ff9991bb2 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>
 2015-03-21 15:55:33 -07:00
Jessie Frazelle
b6e20a67f9 Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
 2015-03-21 15:23:25 -07:00
Ahmet Alp Balkan
28a34dfffd integ-cli: fix bug and race in TestBuildSpaces 
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.

Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-21 19:43:14 +00:00
Mitch Capper
b7dc9040f0 Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles 
Signed-off-by: Mitch Capper <mitch.capper@gmail.com>
 2015-03-20 21:54:33 -07:00
Doug Davis
8071bf3967 Check volume path to make sure its not the empty string 
With this Dockerfile
```
FROM ubuntu
ENV ABC=""
VOLUME $ABC
```

It builds ok but then at run time I get this error:

FATA[0002] Error response from daemon: Cannot start container 8902b4a7aaf5c4e4b11a38070d392db465fa97ad88c91c8b38dda5ab8149ccac: [8] System error: no such file or directory

Because the Volume config shows "" as the path.  This PR checks for "" as
the path and stops it at build time.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-20 21:39:49 -07:00
Doug Davis
6d66e3e7a5 Fix some escaping around env var processing 
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-20 20:09:00 -07:00
Doug Davis
e3e6f8e859 Merge pull request #11531 from vishh/parent-cgroup 
Remove debug log line from cgroup-parent feature e2e test.
 2015-03-20 20:30:01 -04:00
Michael Crosby
84d3ab30d4 Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode 
Fix hostname missing when a container's net mode is contaienr mode
 2015-03-20 16:49:37 -07:00
Michael Crosby
ca6512acba Merge pull request #11272 from dmcgowan/enable-v2-default-push 
Enable v2 default push
 2015-03-20 16:47:32 -07:00
Michael Crosby
ca3a912287 Merge pull request #11528 from jlhawn/separate_init_blob_upload 
Separate init blob upload
 2015-03-20 16:39:31 -07:00
Vishnu Kannan
a7639c2e1f Remove debug log line from cgroup-parent feature e2e test. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-20 23:25:34 +00:00
Doug Davis
c536e5bfb4 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning 
Add cli build warning about chmod bits on windows
 2015-03-20 19:19:38 -04:00