Modified: mesos/site/source/documentation/latest/committing.md URL: http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/committing.md?rev=1681818&r1=1681817&r2=1681818&view=diff ============================================================================== --- mesos/site/source/documentation/latest/committing.md (original) +++ mesos/site/source/documentation/latest/committing.md Tue May 26 19:19:53 2015 @@ -9,7 +9,9 @@ work with one during code review to get If you are a committer, here are some guidelines for committing changes: -1. **Follow the format of commit messages**: we currently do not leverage +1. **Check the JIRA ticket**: make sure there is no further discussion + needed regarding the approach used in the patch. +2. **Follow the format of commit messages**: we currently do not leverage any tooling to enforce the format of messages, so: a. Be clear and explicit in the commit message. b. Include the link to the review (this will be done automatically if @@ -20,14 +22,14 @@ If you are a committer, here are some gu c. Use 72 character columns. Note that we don't always have a 50 character or less summary because that restriction tends to cause people to write poorly. -2. **Keep the 'Author' intact**: `support/apply-review.sh` will handle +3. **Keep the 'Author' intact**: `support/apply-review.sh` will handle this for you, but be careful when rebasing or ammending. -3. **Never ever commit a merge**: always rebase instead, as appropriate. +4. **Never ever commit a merge**: always rebase instead, as appropriate. Likewise, never 'force push'. -4. **Don't break the build**: we support Linux and Mac OS X, however not +5. **Don't break the build**: we support Linux and Mac OS X, however not all configurations are being tested in Jenkins, so be aware of that. Also, pay attention to the Jenkins review bot if it flags a review as breaking the build. Note that if you do break the build, the fixes are often small and inconsequential so don't worry about going through a review cycle for that, just fix things (but don't take that as a license - to "wait until the build fails to fix things"). \ No newline at end of file + to "wait until the build fails to fix things").
Modified: mesos/site/source/documentation/latest/configuration.md URL: http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/configuration.md?rev=1681818&r1=1681817&r2=1681818&view=diff ============================================================================== --- mesos/site/source/documentation/latest/configuration.md (original) +++ mesos/site/source/documentation/latest/configuration.md Tue May 26 19:19:53 2015 @@ -859,6 +859,43 @@ file:///path/to/file (where file contain </tr> <tr> <td> + --[no-]docker_kill_orphans + </td> + <td> + Enable docker containerizer to kill orphaned containers. + You should consider setting this to false when you launch multiple + slaves in the same OS, to avoid one of the DockerContainerizer removing + docker tasks launched by other slaves. However you should also make sure + you enable checkpoint for the slave so the same slave id can be reused, + otherwise docker tasks on slave restart will not be cleaned up. + (default: true) + </td> + </tr> + <tr> + <td> + --docker_sock=VALUE + </td> + <td> + The UNIX socket path to be mounted into the docker executor container to + provide docker CLI access to the docker daemon. This must be the path used + by the slave's docker image. + (default: /var/run/docker.sock) + </td> + </tr> + <tr> + <td> + --docker_mesos_image=VALUE + </td> + <td> + The docker image used to launch this mesos slave instance. + If an image is specified, the docker containerizer assumes the slave + is running in a docker container, and launches executors with + docker containers in order to recover them when the slave restarts and + recovers. + </td> + </tr> + <tr> + <td> --docker_sandbox_directory=VALUE </td> <td> Modified: mesos/site/source/documentation/latest/docker-containerizer.md URL: http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/docker-containerizer.md?rev=1681818&r1=1681817&r2=1681818&view=diff ============================================================================== --- mesos/site/source/documentation/latest/docker-containerizer.md (original) +++ mesos/site/source/documentation/latest/docker-containerizer.md Tue May 26 19:19:53 2015 @@ -39,18 +39,17 @@ Currently the Docker Containerizer when 1, Fetch all the files specified in the CommandInfo into the sandbox. 2, Pull the docker image from the remote repository. -3, Run the docker image with the configured DockerInfo options, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable. -4. Stream the docker logs into the stdout/stderr files in the sandbox. -5. Launch the Command Executor to perform a docker wait on the container. -6. On container exit or containerizer destroy, stop and remove the docker container. +3, Run the docker image with the Docker executor, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable. + The executor will also stream the container logs into stdout/stderr files in the sandbox. +4. On container exit or containerizer destroy, stop and remove the docker container. -The Docker Containerizer launches all containers with the "mesos-" prefix (ie: mesos-abcdefghji), and also assumes all containers with the "mesos-" prefix is managed by the slave and is free to stop or kill the containers. +The Docker Containerizer launches all containers with the "mesos-" prefix plus the slave id (ie: mesos-slave1-abcdefghji), and also assumes all containers with the "mesos-" prefix is managed by the slave and is free to stop or kill the containers. When launching the docker image as an Executor, the only difference is that it skips launching a command executor but just reaps on the docker container executor pid. -Note that we currently default to host networking when running a docker image, to easier support running a docker image asn an Executor. +Note that we currently default to host networking when running a docker image, to easier support running a docker image as an Executor. -Also since we explicitly attempt to pull the image on launch, if the docker image is only installed locally but not avaialble on the remote repository the launch will fail as well. +The containerizer also supports optional force pulling of the image, and if disabled the docker image will only be updated again if it's not available on the host. ## Private Docker repository @@ -65,3 +64,9 @@ To run a docker image with the default c To run a docker image with an entrypoint defined, the CommandInfo's shell option must be set to false. If shell option is set to true the Docker Containerizer will run the user's command wrapped with /bin/sh -c which will also become parameters to the image entrypoint. + +## Recover Docker containers on slave recovery + +The Docker containerizer supports recovering Docker containers when the slave restarts, which supports both when the slave is running in a Docker container or not. + +With the docker_mesos_image flag enabled, the Docker containerizer assumes the containerizer is running in a container itself and modifies the mechanism it recovers and launches docker containers accordingly. Modified: mesos/site/source/documentation/latest/powered-by-mesos.md URL: http://svn.apache.org/viewvc/mesos/site/source/documentation/latest/powered-by-mesos.md?rev=1681818&r1=1681817&r2=1681818&view=diff ============================================================================== --- mesos/site/source/documentation/latest/powered-by-mesos.md (original) +++ mesos/site/source/documentation/latest/powered-by-mesos.md Tue May 26 19:19:53 2015 @@ -7,6 +7,7 @@ layout: documentation ## Organizations using Mesos * [Airbnb](http://www.airbnb.com) +* [Allegro](http://allegrotech.io) * [Altocloud](http://www.altocloud.com/) * [Apple](http://www.apple.com) * [Artirix](http://www.artirix.com)
