cf4bb4cfd0
Squash []map[string]type for port_map and labels into map[string]type
2015-11-19 21:29:37 -08:00
275550dcd3
Fixed some issues with expose, port mapping, and environment variables
...
- Port mapping now works for reserved ports as well as dynamic ports
- Environment variables were being set twice in two different ways; now they are only set once
- Comprehensive tests for exposed ports, forwarded ports, and environment variables
- Cleaned up / DRYed up a lot of test code
2015-11-19 19:08:21 -08:00
b9b786732e
Export DockerHandle and change tests to use DockerHandle.ContainerID()
2015-11-19 14:20:41 -08:00
6253b1d0aa
Add ContainerID() method to get the containerID from a handle
2015-11-19 13:57:18 -08:00
581245f881
fix docker port allocation?
2015-11-19 19:15:25 +01:00
4d817f5cbc
Revert "Revert "Make drivers take arguments as a list and not as a string""
2015-11-18 15:16:42 -08:00
0e51375285
Revert "Make drivers take arguments as a list and not as a string"
2015-11-18 13:46:43 -08:00
6574fd27e3
Remove returning the error
2015-11-18 12:40:34 -08:00
5a678548fa
Rebase
2015-11-18 12:30:35 -08:00
54ddf4d3c1
Rebase
2015-11-18 12:29:04 -08:00
fc69721cc7
Added missing %s to error format string
2015-11-18 11:29:49 -08:00
e17f5984ef
Revert "Added missing %s to error format string"
...
This reverts commit f4acdfd035c2ffa196035cc574d8b40a1795abb3.
2015-11-18 11:28:38 -08:00
7a077a29b5
Added missing %s to error format string
2015-11-18 11:28:07 -08:00
b9fcdc400a
Merge branch 'master' into f-docker-dns-config
2015-11-18 10:31:06 -08:00
4a6c3d773d
Nest Docker driver auth under object
2015-11-18 01:37:42 -08:00
de6c06d332
De-nest docker registry auth and reformat related doc
2015-11-17 23:32:57 -08:00
c80cf651e8
Merge branch 'master' into f-docker-dns-config
2015-11-17 21:43:04 -08:00
7b25c9b4d9
Change dns_servers and dns_search_domains from comma-delimited strings to lists
2015-11-17 21:41:00 -08:00
c851ae67c7
Change error check to contains instead of ==
2015-11-17 21:36:23 -08:00
563e1aff56
Renamed some things so it's more apparent that reserved and dynamic port mapping have very similar code
2015-11-17 21:34:07 -08:00
8705ea07a4
Remove \n since this is added by the logger
2015-11-17 21:17:51 -08:00
5ac6664c46
Purge existing container during Start()
2015-11-17 20:50:14 -08:00
0e1fe2373a
Log container name and labels
2015-11-17 20:04:10 -08:00
640af994ca
Added a randomized alloc id for tests so container names don't collide
2015-11-17 19:45:33 -08:00
9a7adb9eb3
Fix guards for docker port mapping and change dummy dynamic ports to real ports (0 is not a valid port)
2015-11-17 19:21:36 -08:00
d098acef90
Fix guard for port maps not being specified
2015-11-17 18:16:01 -08:00
122220a424
Merge branch 'master' into f-docker-any-network
2015-11-17 17:22:13 -08:00
9cad290b18
Merge pull request #436 from hashicorp/f-docker-cleanup
...
Cleanup docker driver
2015-11-17 17:13:17 -08:00
b22b5eb3aa
Inline err assignment
2015-11-17 17:12:45 -08:00
a2f4188246
Streamline reading boolean values from the driver / job config
2015-11-17 16:58:23 -08:00
67ee502acb
Added missing linebreaks for log.Printf calls
2015-11-17 16:49:01 -08:00
43aaf94383
Do Itoa once so line items are simpler
2015-11-17 16:31:47 -08:00
ffd3f114dd
Merge branch 'docker-allow-to-add-labels' of https://github.com/fernandezvara/nomad into f-docker-labels
2015-11-17 16:02:42 -08:00
3b7c252090
Improve phrasing in log messages
2015-11-17 15:17:44 -08:00
7551a263c5
Merge pull request #389 from achanda/name
...
Set a name for the container
2015-11-17 15:07:23 -08:00
629cdd6baa
Clean up extraneous variables
2015-11-17 14:51:38 -08:00
7f117b3b55
That's not a declaration
2015-11-17 14:27:58 -08:00
89c6f56059
Remove restrictions from docker networking mode; we assume users know what they are doing
2015-11-17 14:25:10 -08:00
f2e8357e4a
Merge branch 'master' into f-docker-cleanup
2015-11-17 14:20:29 -08:00
f7f83ee81c
allow to set labels on docker containers
2015-11-17 14:12:49 +01:00
77923255b4
Add hostname parameter to Docker driver
2015-11-16 22:44:44 -08:00
bac9bd60dc
Improve logging and DRY some of the port mapping code
2015-11-16 19:55:49 -08:00
03847dd65a
Addressed some review comments
2015-11-16 22:29:06 -05:00
714e1b52d1
Change logging port as %d to logging port.Value
2015-11-16 16:05:28 -08:00
9f40143684
Merge branch 'master' into f-port-labels
2015-11-16 16:02:38 -08:00
82f51601db
Track Task State in the client and capture Wait results
2015-11-16 15:14:21 -08:00
c5102975e3
Made the code more DRY
2015-11-16 13:10:57 -08:00
e40229aed6
Fixed the docker auth config
2015-11-16 13:10:57 -08:00
7d44725370
Adding comments to fields in the docker driver config
2015-11-16 13:10:57 -08:00
fa60d86fe5
mapstructure close quotes
2015-11-16 13:10:57 -08:00
9d76572831
Making sure that there is only one port_map block in the docker driver config
2015-11-16 13:10:57 -08:00
78a0f82bc5
Making the config for drivers public
2015-11-16 13:10:57 -08:00
4e05b27111
Implemented port labeling and driver configs
2015-11-16 13:10:57 -08:00
2f05a15aa5
Expose mapped ports
2015-11-12 17:23:04 -08:00
7f3a2595af
Change Docker fingerprinter to INFO and not error when the connection to the daemon fails; we simply assume docker isn't there.
2015-11-10 16:18:52 -08:00
e5688620e4
Changed behavior for Docker ENV
...
- Docker ENV variables now work the same way in production, dev, and test
- Docker ENV variables are *ignored* if docker.endpoint is present in the Nomad config file
- Remote tests now work correctly
2015-11-10 15:54:31 -08:00
bb9f2aa66c
Docker privileged checks if host enabled it
2015-11-06 10:38:54 -08:00
149366b89e
Merge pull request #390 from the-control-group/f-docker-driver-options
...
Expanded docker driver options
2015-11-06 10:32:54 -08:00
94a4d00f4b
Set a name for the container.
2015-11-06 03:33:57 +00:00
5e2430de74
Fix build
...
returned wrong value, and forot a ":" :/
2015-11-05 17:57:51 -08:00
1169bef912
Updated `priviliged` option, added client `priviliged` option
...
- Added error checking on priviliged mode.
- Added `docker.privileged.enabled` to client config/fingerprint
2015-11-05 16:40:20 -08:00
f9fd83c696
Merge fix
2015-11-05 13:46:02 -08:00
c174f4819b
Added task configuraton options for docker driver
...
- Added `priviliged` option to task config to allow containers to run in
priviliged mode.
- Added `dns-servers` option to task config to allow containers to use
custom DNS servers
- Added `search-domains` option to task config to allow containers to
use custom dns search domains
- Added authentication options (under key namespace `auth.*`) to allow
authentication on a task level for docker remote.
- Updated site docs to reflect changes
2015-11-05 10:47:41 -08:00
1e47dd4c7d
Apply SELinux label to allocate directory of docker driver
2015-11-05 09:06:22 +09:00
c7fd8993c1
Change two helper functions to be methods
2015-10-15 17:47:14 -07:00
a0d9f8dd33
Remove debug lines
2015-10-15 17:30:40 -07:00
2f6a279d09
Docker alloc dir tests and test fixes
2015-10-15 16:59:08 -07:00
1d15f6eda6
Bind alloc dir and task local dir to docker containers and parse args correctly
2015-10-15 16:40:07 -07:00
dbe9fa9f27
Run gofmt on the docker driver
2015-10-13 23:21:16 +00:00
36dc8a5a18
Do not default to a network mode
...
Makes the driver error out when a wrong or un-supported
network_mode is used
2015-10-13 10:57:21 -07:00
a4035050e8
Change Docker/Rkt to set driver to 1 not true for consistency
2015-10-12 13:15:37 -07:00
a9f1f64199
Use DefaultDockerHost from fsouza upstream
2015-10-08 12:35:19 -07:00
3c170b70ee
Remove panic -- client is nil when there is an error
2015-10-06 19:09:59 -07:00
a4c3da6c0c
Merge branch 'master' into b-docker-port
2015-10-06 17:54:32 -07:00
d046858057
Support boot2docker or VM for dev/test
2015-10-06 17:53:05 -07:00
88bb01ab6f
Fingerprint test should now behave correctly when the executor is not installed; fix some go vet issues
2015-10-06 16:33:02 -07:00
8cd34d3947
Use docker.NewClient; move dockerClient before it's used
2015-10-06 16:26:31 -07:00
5e73e746dc
Merge branch 'docker-use-environment' of https://github.com/carlosdp/nomad into b-docker-port
2015-10-06 15:36:06 -07:00
aaddc7bf6c
Use environment to connect to Docker by default
...
Uses the environment definition for docker by default. Docker will
default to the unix/tcp socket if the environment is not set.
2015-10-04 12:59:54 -07:00
faf8002d2d
go-fmt
2015-10-02 10:54:04 -07:00
3751b46673
Make sure createHostConfig is called only once
...
The second call discards any mods to port binding or
network type
Fixes #185 and #196
2015-10-02 10:43:37 -07:00
0cb649bd5f
Enable setting networking mode for docker
...
This patch enables setting networking mode for the docker
driver. This does not handle the `container` mode.
Closes #175
2015-10-01 18:52:41 -07:00
6ff19853ef
docker: check for missing unix socket
2015-09-27 17:49:58 -07:00
a45f9f2e71
Pull task environments into their own type to be reusable across drivers and executors
2015-09-27 17:37:24 -07:00
a7eebcbd5b
merge fixes
2015-09-27 17:37:24 -07:00
162247ffbe
Correct implementation of config check for container and image cleanup; moved into Start and Open because handle does not have the config object
2015-09-27 13:59:38 -07:00
9455370d8e
Merge branch 'master' into f-docker-config-cleanup
2015-09-26 21:52:02 -07:00
5678859752
Add configuration option for whether Nomad will clean up containers and images when they are no longer used
2015-09-26 18:53:15 -07:00
79488baa4d
Add all containers when searching for images that are still in used, since the container using the image may be stopped
2015-09-26 18:51:36 -07:00
af314b0f4d
Log an info when an image can't be removed because it's still in use
2015-09-26 00:34:57 -07:00
5632a33036
Use env.Get, remove sha256 checks, and change from regexp to strconv to test for int
2015-09-25 23:55:01 -07:00
7021ac3ce8
Add docker 'command' to docs; cleanup some comments
2015-09-25 23:28:23 -07:00
23407c54af
Replace docker version and docker ps with native calls; no more exec!
2015-09-25 23:13:40 -07:00
72cd22347f
Docker kill now exits with an error, as expected
2015-09-25 22:43:19 -07:00
0c31a83783
Go native for docker API calls
2015-09-25 20:01:03 -07:00
efb7c409bb
Improve handling of tagged docker images
...
- Converted Start() to use docker native client throughout
- Better handling of latest vs. tagged images
- We can now support multiple versions of an image
- We will now not download a tag if we already have it
2015-09-25 18:22:10 -07:00
d2aa4fd53c
Merge pull request #104 from hashicorp/f-docker-static-ports
...
Add static (reserved) ports for docker
2015-09-24 15:44:41 -07:00
40ce6ece41
Get only one version of a docker container
2015-09-24 14:07:28 -07:00
f8e8084c71
Rename containerConfigForTask to createContainer to mirror the docker api call; other helper functions will follow this convention too
2015-09-24 00:00:46 -07:00
a071bb6d59
Rename containerConfig to hostConfig since there are two types of container configs
2015-09-23 23:57:04 -07:00
Chris Bednarski