-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expanded docker driver options #390
Merged
dadgar
merged 4 commits into
hashicorp:master
from
the-control-group:f-docker-driver-options
Nov 6, 2015
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0521562
Added task configuraton options for docker driver
Sdedelbrock 467777e
Merge branch 'master' of https://github.com/hashicorp/nomad into f-do…
Sdedelbrock b8b8fe5
Updated `priviliged` option, added client `priviliged` option
Sdedelbrock e2f1599
Fix build
Sdedelbrock File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,26 @@ The `docker` driver supports the following configuration in the job specificatio | |
network mode is not supported right now and is reported as an invalid | ||
option. | ||
|
||
* `privileged` - (optional) Privileged mode gives the container full access to | ||
the host. Valid options are `"true"` and `"false"` (defaults to `"false"`). | ||
In order to use privileged mode, a client with the option | ||
`docker.privileged.enabled = "true"` must be available. | ||
|
||
* `dns-servers` - (optional) A comma separated list of DNS servers for the container | ||
to use (e.g. "8.8.8.8,8.8.4.4"). *Docker API v1.10 and above only* | ||
|
||
* `search-domains` - (optional) A comma separated list of DNS search domains for the | ||
container to use. | ||
|
||
**Authentication** | ||
Registry authentication can be set per task with the following authentication | ||
parameters. These options can provide access to private repositories that | ||
utilize the docker remote api (e.g. dockerhub, quay.io) | ||
- `auth.username` - (optional) The account username | ||
- `auth.password` - (optional) The account password | ||
- `auth.email` - (optional) The account email | ||
- `auth.server-address` - (optional) The server domain/ip without the protocol | ||
|
||
### Port Mapping | ||
|
||
Nomad uses port binding to expose services running in containers using the port | ||
|
@@ -121,6 +141,11 @@ The `docker` driver has the following configuration options: | |
* `docker.cleanup.image` Defaults to `true`. Changing this to `false` will | ||
prevent Nomad from removing images from stopped tasks. | ||
|
||
* `docker.privileged.enabled` Defaults to `false`. Changing this to `true` will | ||
allow containers to use "privileged" mode, which gives the containers full access | ||
to the host | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please put a period after |
||
|
||
|
||
Note: When testing or using the `-dev` flag you can use `DOCKER_HOST`, | ||
`DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` to customize Nomad's behavior. In | ||
production Nomad will always read `docker.endpoint`. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The last check that is needed is to see if the agent config allows this. So that if the
docker.privileged.enabled
is false and the task hasprivileged = true
then it is overridden and logged.