Commit Graph

569 Commits

Author SHA1 Message Date
Alex Dadgar
ee1887e609 Rebase 2015-11-18 12:29:04 -08:00
Alex Dadgar
d20be7b58c Update ParseAndReplace to take a list of args and remove shell style parsing 2015-11-18 12:29:04 -08:00
Chris Hines
9666f450e7 Move test code to *_test.go file. 2015-11-18 14:46:56 -05:00
Chris Bednarski
c375000f08 Added missing %s to error format string 2015-11-18 11:29:49 -08:00
Chris Bednarski
85d07e72bf Revert "Added missing %s to error format string"
This reverts commit f4acdfd035.
2015-11-18 11:28:38 -08:00
Chris Bednarski
f4acdfd035 Added missing %s to error format string 2015-11-18 11:28:07 -08:00
Diptanu Choudhury
3d8cb63c4f Merge pull request #446 from hashicorp/f-consul-client
Register services with Consul
2015-11-18 10:39:58 -08:00
Diptanu Choudhury
32d9d9f4bf Added a log line to indicate we are registering a service with Consul 2015-11-18 10:32:31 -08:00
Chris Bednarski
20b42864be Merge branch 'master' into f-docker-dns-config 2015-11-18 10:31:06 -08:00
Diptanu Choudhury
61b3b706f0 Added a lock around modification of tracked services map 2015-11-18 09:36:37 -08:00
Diptanu Choudhury
90f589fdc4 Added some docs 2015-11-18 05:49:40 -08:00
Diptanu Choudhury
112e385066 Removed a debug log 2015-11-18 05:20:57 -08:00
Diptanu Choudhury
6d81111995 Added the option to configure consul address 2015-11-18 05:15:52 -08:00
Diptanu Choudhury
3866d4ed4f Shutting down consul an not trying to de-register the consul service 2015-11-18 04:59:57 -08:00
Diptanu Choudhury
7efac5dae8 Added the logic to retry services which needs to be tracked if consul doesn't respond 2015-11-18 04:34:23 -08:00
Diptanu Choudhury
992b6709e2 Registering the checks with consul 2015-11-18 03:08:53 -08:00
Diptanu Choudhury
929882426c Defering calling the de-register from consul call when a service is not running 2015-11-18 02:37:34 -08:00
Diptanu Choudhury
4221cda6f7 Added a logger to consul client 2015-11-18 02:14:07 -08:00
Carlos Diaz-Padron
270631a006 Nest Docker driver auth under object 2015-11-18 01:37:42 -08:00
Diptanu Choudhury
df074a54e3 DRYed the code 2015-11-18 01:20:53 -08:00
Diptanu Choudhury
392a807305 Moving the logic to find port and host inside consul client 2015-11-18 01:18:29 -08:00
Diptanu Choudhury
9a578c5c0d Added the implementation of consul client 2015-11-18 00:50:45 -08:00
Carlos Diaz-Padron
fba3c573f1 De-nest docker registry auth and reformat related doc 2015-11-17 23:32:57 -08:00
Chris Bednarski
2024cb8f94 Change DNS and DNSSearch to use lists; added a test 2015-11-17 22:02:23 -08:00
Chris Bednarski
673ce8ad70 Merge branch 'master' into f-docker-dns-config 2015-11-17 21:43:04 -08:00
Chris Bednarski
bd06a84cc9 Change dns_servers and dns_search_domains from comma-delimited strings to lists 2015-11-17 21:41:00 -08:00
Chris Bednarski
f3c204546f Merge pull request #439 from hashicorp/b-docker-ports-len
Fix docker port tests and empty port_map
2015-11-17 21:37:48 -08:00
Chris Bednarski
a52c3df0bf Change error check to contains instead of == 2015-11-17 21:36:23 -08:00
Chris Bednarski
e252a84310 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
Chris Bednarski
d80c024627 Remove \n since this is added by the logger 2015-11-17 21:17:51 -08:00
Alex Dadgar
c6c896bbea Qemu driver takes a port_map to configure host to guest port forwarding 2015-11-17 20:54:53 -08:00
Chris Bednarski
9277027e50 Purge existing container during Start() 2015-11-17 20:50:14 -08:00
Chris Bednarski
e994453abd Log container name and labels 2015-11-17 20:04:10 -08:00
Chris Bednarski
0e7ee06708 Added a randomized alloc id for tests so container names don't collide 2015-11-17 19:45:33 -08:00
Chris Bednarski
02e59fe622 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
Alex Dadgar
c3a37668dc Update API docs 2015-11-17 19:12:19 -08:00
Chris Bednarski
3db185807d Fix guard for port maps not being specified 2015-11-17 18:16:01 -08:00
Chris Bednarski
588e5f7df4 Merge branch 'master' into f-docker-any-network 2015-11-17 17:22:13 -08:00
Chris Bednarski
0caf44204d Merge pull request #436 from hashicorp/f-docker-cleanup
Cleanup docker driver
2015-11-17 17:13:17 -08:00
Chris Bednarski
aa997e5559 Inline err assignment 2015-11-17 17:12:45 -08:00
Chris Bednarski
4dfe67631e Streamline reading boolean values from the driver / job config 2015-11-17 16:58:23 -08:00
Chris Bednarski
0251545f2b Added missing linebreaks for log.Printf calls 2015-11-17 16:49:01 -08:00
Chris Bednarski
0934de75a9 Do Itoa once so line items are simpler 2015-11-17 16:31:47 -08:00
Chris Bednarski
57a47eca73 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
Chris Bednarski
6b9682f795 Improve phrasing in log messages 2015-11-17 15:17:44 -08:00
Alex Dadgar
dc0501e589 Merge pull request #389 from achanda/name
Set a name for the container
2015-11-17 15:07:23 -08:00
Chris Bednarski
bbcee39789 Clean up extraneous variables 2015-11-17 14:51:38 -08:00
Chris Bednarski
f9ee85c669 That's not a declaration 2015-11-17 14:27:58 -08:00
Chris Bednarski
0e0d96cec9 Remove restrictions from docker networking mode; we assume users know what they are doing 2015-11-17 14:25:10 -08:00
Chris Bednarski
bebf2b0689 Merge branch 'master' into f-docker-cleanup 2015-11-17 14:20:29 -08:00