docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,402 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

3402 Commits

Author SHA1 Message Date
Guillaume J. Charmes 92cd2f5bad Merge pull request #1146 from benoitc/feature/attach_ws 
* Runtime: add websocket support to /container/<name>/attach/ws
 2013-08-09 15:38:24 -07:00
Guillaume J. Charmes 8d1cd63dfa Merge pull request #1460 from dotcloud/patch1 
* Runtime: Mount /dev/shm as a tmpfs
 2013-08-09 15:18:22 -07:00
Michael Crosby 2c4c10fb4a Merge pull request #1477 from kevinclark/builder-fixme 
Only count known instructions as build steps
 2013-08-09 14:45:06 -07:00
Kevin Clark 722d4e916a Add myself to AUTHORS 2013-08-09 14:39:03 -07:00
Kevin Clark 4ff649a4ea Only count known instructions as build steps 
stepN is only used in the log line, so if we only produce the log line
when there's a message, it should do the right thing.

If it's *not* a valid instruction, it gets a line as well, so there's no
reason to double up.
 2013-08-09 14:38:29 -07:00
unclejack 641ddaeb03 add formatting directive to failure to stop container error 2013-08-09 23:27:34 +03:00
unclejack 2ba5c91547 minor cleanup for signal handling 2013-08-09 23:23:27 +03:00
Michael Crosby 25e7227c81 Merge pull request #1462 from dotcloud/fix_build_events_output 
Fix docker build and docker events output
 2013-08-09 12:41:18 -07:00
Jérôme Petazzoni 04cd0a392b Merge pull request #1463 from jpetazzo/https-get-docker-io 
switch from http to https for get.docker.io
 2013-08-09 11:26:56 -07:00
Guillaume J. Charmes db9d68c3e4
Improve TestKillDifferentUser to prevent timeout on buildbot 2013-08-09 10:50:58 -07:00
unclejack 88cb9f3116 keep processing signals after the first one 2013-08-09 20:33:17 +03:00
Guillaume J. Charmes 55f9610cde Merge pull request #1452 from dotcloud/improve_TestGetContainersTop 
* Tests: Improve TestGetContainersTop so it does not rely on sleep
 2013-08-09 10:28:34 -07:00
shin- 6178dc7f1b brew: added safeguards in script and changed default branch to 'master' 2013-08-09 16:40:28 +02:00
Solomon Hykes b8f8f9d07e Merged 0.5.2 hotfix release back to master 2013-08-08 19:45:57 -07:00
Michael Crosby 1643943402 Merge pull request #1464 from dotcloud/bump_0.5.2 
Bump to 0.5.2
 2013-08-08 17:36:53 -07:00
Michael Crosby e99a99eb6e Bump to v0.5.2 2013-08-09 00:17:35 +00:00
Michael Crosby df9712f1c8 Change daemon to listen on unix socket by default 
Conflicts:
	docs/sources/api/docker_remote_api.rst
 2013-08-09 00:16:43 +00:00
Michael Crosby 28d38620f0 Merge pull request #1417 from crosbymichael/root-socket 
Change daemon to listen on unix socket by default
 2013-08-08 17:06:49 -07:00
Jérôme Petazzoni 1ce9b3ca9c switch from http to https 2013-08-08 17:02:59 -07:00
Jérôme Petazzoni 5c56b597a9 change network range to avoid conflict with EC2 DNS 2013-08-08 23:27:55 +00:00
Michael Crosby f712e10cb2 Forbid certain paths within docker build ADD 
Conflicts:
	buildfile_test.go
 2013-08-08 23:22:14 +00:00
Victor Vieux 213365c2d2 fix docker build and docker events output 2013-08-08 22:51:39 +00:00
Sam Alba 7f02bd3b7a Merge pull request #1361 from dotcloud/library 
Docker-brew and Docker standard library
 2013-08-08 14:22:20 -07:00
Guillaume J. Charmes ceb33818cd
Improve TestGetContainersTop so it does not rely on sleep 2013-08-08 11:51:31 -07:00
Guillaume J. Charmes 18fc707fdf
Make sure all needed mountpoint are present 2013-08-08 11:25:02 -07:00
Michael Crosby c3027fa9ac Merge pull request #1216 from dotcloud/add_some_tests 
Add some tests in server and utils
 2013-08-08 09:57:18 -07:00
Victor Vieux 4249867e5b rebase 2013-08-08 14:58:52 +00:00
Victor Vieux c804a5f827 rebase master 2013-08-08 14:56:37 +00:00
Victor Vieux be77ee33bc Merge branch 'master' into add_some_tests 2013-08-08 14:44:56 +00:00
Victor Vieux 5928ed5d45 Merge pull request #1456 from dotcloud/1455-force_commit_build_env 
Make sure ENV instruction within build perform a commit each time
 2013-08-08 07:37:51 -07:00
Karan Lyons 075d30dbce Mount /dev/shm as a tmpfs 
Fixes #1122.
 2013-08-07 17:44:33 -07:00
Guillaume J. Charmes 6a6a2ad8a4
Make sure ENV instruction within build perform a commit each time 2013-08-07 17:23:49 -07:00
Guillaume J. Charmes 279fe144e1 Merge pull request #1420 from jpetazzo/fix-get-docker-io-upstart-script 
* Packaging: Fix the upstart script generated by get.docker.io
 2013-08-07 17:13:54 -07:00
Daniel Mizyrycki cc80bd41c4 Merge pull request #1423 from krautcomputing/fix_indentation_in_vagrantfile 
Fix indentation in Vagrantfile
 2013-08-07 17:10:40 -07:00
Andy Rothfusz 06183e6cdc Merge pull request #1447 from kermit666/image-tag-doc 
doc: syntax to run a specific image tag
 2013-08-07 16:23:45 -07:00
Guillaume J. Charmes 6249cc3373 Merge pull request #1425 from dotcloud/simplify_ProgressReader 
- Runtime: fix small \n error un docker build
 2013-08-07 16:19:42 -07:00
Solomon Hykes 80f34c6aeb Merge pull request #1451 from dotcloud/michael-maintainer 
Add Michael Crosby to core maintainers
 2013-08-07 15:53:29 -07:00
Guillaume J. Charmes a2f526dadc Merge pull request #1435 from jpetazzo/userland-proxy-should-listen-on-inaddr-any 
* Runtime: Let userland proxy handle container-bound traffic
 2013-08-07 15:48:17 -07:00
Guillaume J. Charmes 429d2f85cb Merge pull request #1445 from dsissitka/host 
* Runtime: Updated the Docker CLI to specify a value for the "Host" header.
 2013-08-07 15:38:50 -07:00
Guillaume J. Charmes 2ca018b2eb Merge pull request #1395 from c00w/490-warn-ipv4forwarding-disabled 
* Runtime: Add warning when net.ipv4.ip_forwarding = 0
 2013-08-07 15:31:12 -07:00
Guillaume J. Charmes 3e6e08ce00 Merge pull request #1362 from dotcloud/registry_test 
* Registry: Registry unit tests + mock registry
 2013-08-07 15:30:07 -07:00
Colin Rice 3e491f8698 Fix reversed IPv4Forwarding check in api.go 2013-08-07 18:28:40 -04:00
Colin Rice ccffa69766 Add Colin Rice to AUTHORS file 2013-08-07 18:28:39 -04:00
Colin Rice 10190be5d7 Add warning when net.ipv4.ip_forwarding = 0 
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
 2013-08-07 18:28:39 -04:00
Guillaume J. Charmes 65a4e30825 Merge pull request #1093 from monnand/910-login-info 
* Runtime: fixed #910. print user name to docker info output
 2013-08-07 15:09:55 -07:00
Guillaume J. Charmes e63960caae Merge pull request #1450 from dotcloud/add-sandbox 
- Builder: Forbid certain paths within docker build ADD
 2013-08-07 15:04:36 -07:00
benoitc e2ca600fd8 Merge branch 'feature/attach_ws' into feature/attach_ws2 
Conflicts:
	api.go
 2013-08-07 23:30:28 +02:00
Solomon Hykes 4860df1689 Add Michael Crosby to core maintainers 2013-08-07 21:24:41 +00:00
Michael Crosby ced93bcabd Modify test to accept error from mkContainer 2013-08-07 19:07:39 +00:00
Sean P. Kane 0e21de9a25 Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools 2013-08-07 09:38:49 -07:00