Commit Graph

3720 Commits

Author SHA1 Message Date
Kawsar Saiyeed e737856a7f Still missed -entrypoint from 'docker run' 2013-08-11 01:29:22 +01:00
Kawsar Saiyeed ae1909b482 Clarified bash completion limitations 2013-08-11 01:08:47 +01:00
Kawsar Saiyeed d75282eb14 Missed -entrypoint from 'docker run' options 2013-08-11 00:57:18 +01:00
Daniel Mizyrycki cd9886f0a8 Merge pull request #1489 from dotcloud/1422-revert-upstart
Revert "docker.upstart: avoid spawning a `sh` process"
2013-08-10 11:07:21 -07:00
Jonathan Rudenberg a43bae4c0b gitignore all test files 2013-08-10 13:48:24 -04:00
Kawsar Saiyeed 91ae135896 Add description and usage information 2013-08-10 13:05:31 +01:00
Greg Thornton 57b49efc98 Skip existing volumes in volumes-from
Removes the error when a container already has a volume that would otherwise
be created by `Config.VolumesFrom`. Allows restarting containers with a
`Config.VolumesFrom` set.
2013-08-10 06:37:57 +00:00
Greg Thornton 3bd73a9633 Apply volumes-from before creating volumes
Copies the volumes from the container specified in `Config.VolumesFrom` before
creating volumes from `Config.Volumes`. Skips any preexisting volumes when
processing `Config.Volumes`. Fixes #1351
2013-08-10 04:55:23 +00:00
Michael Crosby e3acbff2ed Revert "docker.upstart: avoid spawning a `sh` process"
This reverts commit 24dd50490a.
2013-08-10 03:06:08 +00:00
Kawsar Saiyeed d6e5c2c276 Add initial bash completion script
The script can be used to auto-complete commands, image names and
container ids from within a bash prompt.

This partially resolves #336.
2013-08-10 02:38:11 +01:00
Jonathan Rudenberg 4dc04d7690 Add GitHub usernames to MAINTAINERS 2013-08-09 21:16:44 -04:00
Michael Crosby 3e12349831 Merge pull request #1484 from titanous/use-range
Use ranged for loop on channels
2013-08-09 18:06:12 -07:00
Jonathan Rudenberg 7c50221de5 Use ranged for loop on channels 2013-08-09 20:42:20 -04:00
Michael Crosby 3d63087f78 Merge pull request #1481 from titanous/fix-sprint
Fix typo: fmt.Sprint -> fmt.Sprintf
2013-08-09 17:28:59 -07:00
Jonathan Rudenberg 1408f08c40 Update AUTHORS 2013-08-09 20:09:42 -04:00
Jonathan Rudenberg 3b23f02229 Fix typo: fmt.Sprint -> fmt.Sprintf 2013-08-09 19:52:05 -04:00
Guillaume J. Charmes fd5099c9fe Merge pull request #1479 from jpetazzo/fix-testbindmounts-typo
- Tests: fix typo in TestBindMounts (runContainer called without image)
2013-08-09 16:20:24 -07:00
Jérôme Petazzoni 68b09cbe3d fix typo in TestBindMounts (runContainer called without image) 2013-08-09 16:03:05 -07:00
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