Diptanu Choudhury
3d002b716d
removing redundant fail()
2015-11-23 10:59:07 -08:00
Diptanu Choudhury
b8c5268d88
Making the restart tracker aware of the exit codes
2015-11-23 10:56:38 -08:00
Diptanu Choudhury
4d2fe73dfb
Not restarting if a task exited properly
2015-11-22 23:47:15 -08:00
Alex Dadgar
6e59527a97
Clear consul attributes if consul couldn't be fingerprinted
2015-11-22 13:51:10 -08:00
Alex Dadgar
77d86d5bb0
Fingerprinter only creates one consul client
2015-11-22 13:42:06 -08:00
Chris Bednarski
3ed8cb5b8b
Merge pull request #481 from hashicorp/b-vet
...
Fix some issues caught by go vet
2015-11-20 16:31:47 -08:00
Chris Bednarski
e6daf57b10
Merge pull request #480 from hashicorp/f-docker-tls-config
...
Added docker.tls config file options and docs
2015-11-20 16:31:41 -08:00
Chris Bednarski
655a4bf334
Fix some issues caught by go vet
2015-11-20 16:01:27 -08:00
Chris Bednarski
719c345164
Change println to printf
2015-11-20 16:00:58 -08:00
Chris Bednarski
8169c8e185
Don't show endpoint when we're not using it
2015-11-20 15:53:38 -08:00
Chris Bednarski
4063b6583e
Added docker.tls config file options and docs
2015-11-20 15:47:03 -08:00
Diptanu Choudhury
f4efcf9678
Merge pull request #479 from hashicorp/r-consul-check
...
Using the service name in the service id so that it's unique
2015-11-20 15:33:57 -08:00
Alex Dadgar
34b2f62c0b
Merge pull request #442 from ChrisHines/windows-spawn
...
Fix tests for nomad/client/driver/spawn package to work on Windows.
2015-11-20 14:49:54 -08:00
Chris Bednarski
16291b2d4f
Merge pull request #476 from hashicorp/b-docker-expose
...
Fixed some issues with expose, port mapping, and environment variables
2015-11-20 14:24:25 -08:00
Alex Dadgar
835343f47d
Renamed whitelisted to skipped and update debug line
2015-11-20 14:07:35 -08:00
Chris Bednarski
10bb550ad8
Added client checks back to the tests that can't use dockerSetup()
2015-11-20 13:50:47 -08:00
Diptanu Choudhury
aaca44c512
Using the service name in the service id so that it's uniq
2015-11-20 10:35:04 -08:00
Chris Bednarski
dd8c9c28f8
Added nil to network.MapLabelToValues call
2015-11-19 22:18:19 -08:00
Chris Bednarski
cf4bb4cfd0
Squash []map[string]type for port_map and labels into map[string]type
2015-11-19 21:29:37 -08:00
Chris Bednarski
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
Alex Dadgar
f64605968f
Tests
2015-11-19 16:43:08 -08:00
Alex Dadgar
c78f69bdee
Implement the driver whitelist
2015-11-19 16:39:21 -08:00
Chris Bednarski
b9b786732e
Export DockerHandle and change tests to use DockerHandle.ContainerID()
2015-11-19 14:20:41 -08:00
Chris Bednarski
6253b1d0aa
Add ContainerID() method to get the containerID from a handle
2015-11-19 13:57:18 -08:00
Chris Bednarski
96f4522a93
Merge pull request #466 from fernandezvara/fix-docker-port-mappings
...
docker port allocation not mapping correctly
2015-11-19 10:34:54 -08:00
Antonio Fernández
581245f881
fix docker port allocation?
2015-11-19 19:15:25 +01:00
Alex Dadgar
a352c0fc69
Fix network fingerprint test
2015-11-19 09:22:32 -08:00
Diptanu Choudhury
d60db5db1c
Merge pull request #464 from hashicorp/f-consul-check
...
Changing the code comment
2015-11-18 19:35:15 -08:00
Diptanu Choudhury
3eb291faef
Changing the code comment
2015-11-18 19:34:50 -08:00
Alex Dadgar
5faa2fd1d9
Merge pull request #463 from hashicorp/f-consul-check
...
Nuking the service and registering it so that checks are cleaned up
2015-11-18 19:34:20 -08:00
Diptanu Choudhury
be4b981aef
Nuking the service and registering it so that checks are cleaned up
2015-11-18 19:31:29 -08:00
Alex Dadgar
f5623a736d
Merge pull request #460 from hashicorp/f-consul-check
...
Making sure we sync the real state of services of a Task with Consul
2015-11-18 19:03:53 -08:00
Alex Dadgar
cf4a44352f
Allow no interfaces in network fingerprinter
2015-11-18 19:01:39 -08:00
Diptanu Choudhury
ece7877a15
Triggering the next sync after we have finished the current one
2015-11-18 18:47:12 -08:00
Diptanu Choudhury
33472fd594
Making sure we sync the real state of services of a Task with Consul
2015-11-18 18:35:22 -08:00
Chris Hines
3a77952d59
Handle additional edge cases when parsing environment variables.
2015-11-18 21:21:07 -05:00
Diptanu Choudhury
65bac7f4db
Updating checks and services when allocs are refreshed
2015-11-18 17:33:29 -08:00
Diptanu Choudhury
f525d86958
Added a test to ensure invalid services are not registered
2015-11-18 17:29:12 -08:00
Alex Dadgar
4d817f5cbc
Revert "Revert "Make drivers take arguments as a list and not as a string""
2015-11-18 15:16:42 -08:00
Diptanu Choudhury
d65d1bdfac
Merge pull request #455 from hashicorp/f-consul-check
...
Refactor consul check
2015-11-18 14:33:34 -08:00
Diptanu Choudhury
9592fd3912
Added a check for accpeting protocol information in consul check
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
c9ca03afa5
Added a test to check check creation
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
5608531143
Added a test to check check creation
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
bb7f29f023
Changed the http field to path
2015-11-18 14:29:55 -08:00
Alex Dadgar
0e51375285
Revert "Make drivers take arguments as a list and not as a string"
2015-11-18 13:46:43 -08:00
Alex Dadgar
6574fd27e3
Remove returning the error
2015-11-18 12:40:34 -08:00
Alex Dadgar
282509eb9b
More test fixes
2015-11-18 12:30:42 -08:00
Alex Dadgar
5a678548fa
Rebase
2015-11-18 12:30:35 -08:00
Alex Dadgar
c04e2b8b8e
Fix executor tests
2015-11-18 12:29:04 -08:00
Alex Dadgar
54ddf4d3c1
Rebase
2015-11-18 12:29:04 -08:00
Alex Dadgar
7b918ee1e7
Update ParseAndReplace to take a list of args and remove shell style parsing
2015-11-18 12:29:04 -08:00
Chris Hines
713d63e467
Move test code to *_test.go file.
2015-11-18 14:46:56 -05:00
Chris Bednarski
fc69721cc7
Added missing %s to error format string
2015-11-18 11:29:49 -08:00
Chris Bednarski
e17f5984ef
Revert "Added missing %s to error format string"
...
This reverts commit f4acdfd035c2ffa196035cc574d8b40a1795abb3.
2015-11-18 11:28:38 -08:00
Chris Bednarski
7a077a29b5
Added missing %s to error format string
2015-11-18 11:28:07 -08:00
Diptanu Choudhury
6c141e253e
Merge pull request #446 from hashicorp/f-consul-client
...
Register services with Consul
2015-11-18 10:39:58 -08:00
Diptanu Choudhury
2deed3a2eb
Added a log line to indicate we are registering a service with Consul
2015-11-18 10:32:31 -08:00
Chris Bednarski
b9fcdc400a
Merge branch 'master' into f-docker-dns-config
2015-11-18 10:31:06 -08:00
Diptanu Choudhury
41a1e6d74b
Added a lock around modification of tracked services map
2015-11-18 09:36:37 -08:00
Diptanu Choudhury
93d0dbc974
Added some docs
2015-11-18 05:49:40 -08:00
Diptanu Choudhury
2f1f3d3898
Removed a debug log
2015-11-18 05:20:57 -08:00
Diptanu Choudhury
2ee71ffb59
Added the option to configure consul address
2015-11-18 05:15:52 -08:00
Diptanu Choudhury
e83387191e
Shutting down consul an not trying to de-register the consul service
2015-11-18 04:59:57 -08:00
Diptanu Choudhury
cc26cb9a7b
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
962e10b102
Registering the checks with consul
2015-11-18 03:08:53 -08:00
Diptanu Choudhury
b8c2cc81f0
Defering calling the de-register from consul call when a service is not running
2015-11-18 02:37:34 -08:00
Diptanu Choudhury
cb34f34c12
Added a logger to consul client
2015-11-18 02:14:07 -08:00
Carlos Diaz-Padron
4a6c3d773d
Nest Docker driver auth under object
2015-11-18 01:37:42 -08:00
Diptanu Choudhury
a447b1ea3c
DRYed the code
2015-11-18 01:20:53 -08:00
Diptanu Choudhury
d6da6372cd
Moving the logic to find port and host inside consul client
2015-11-18 01:18:29 -08:00
Diptanu Choudhury
404810043a
Added the implementation of consul client
2015-11-18 00:50:45 -08:00
Carlos Diaz-Padron
de6c06d332
De-nest docker registry auth and reformat related doc
2015-11-17 23:32:57 -08:00
Chris Bednarski
f4344092fb
Change DNS and DNSSearch to use lists; added a test
2015-11-17 22:02:23 -08:00
Chris Bednarski
c80cf651e8
Merge branch 'master' into f-docker-dns-config
2015-11-17 21:43:04 -08:00
Chris Bednarski
7b25c9b4d9
Change dns_servers and dns_search_domains from comma-delimited strings to lists
2015-11-17 21:41:00 -08:00
Chris Bednarski
6c1df52342
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
c851ae67c7
Change error check to contains instead of ==
2015-11-17 21:36:23 -08:00
Chris Bednarski
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
Chris Bednarski
8705ea07a4
Remove \n since this is added by the logger
2015-11-17 21:17:51 -08:00
Alex Dadgar
2a8bd98fdc
Qemu driver takes a port_map to configure host to guest port forwarding
2015-11-17 20:54:53 -08:00
Chris Bednarski
5ac6664c46
Purge existing container during Start()
2015-11-17 20:50:14 -08:00
Chris Hines
af2c47460b
Speed up tests by allowing parallel execution.
2015-11-17 23:43:20 -05:00
Chris Hines
2120e9e10a
Move defer f.Close after error check.
2015-11-17 23:43:20 -05:00
Chris Hines
8e8eccee20
Use TestMain to provide portable echo and sleep commands.
2015-11-17 23:43:19 -05:00
Chris Hines
071018569d
Extract code to acquire temp file name and make sure the file is closed so os.Remove works on Windows.
2015-11-17 23:43:18 -05:00
Chris Bednarski
0e1fe2373a
Log container name and labels
2015-11-17 20:04:10 -08:00
Chris Bednarski
640af994ca
Added a randomized alloc id for tests so container names don't collide
2015-11-17 19:45:33 -08:00
Chris Bednarski
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
Alex Dadgar
45bb0d349c
Update API docs
2015-11-17 19:12:19 -08:00
Chris Bednarski
d098acef90
Fix guard for port maps not being specified
2015-11-17 18:16:01 -08:00
Chris Bednarski
122220a424
Merge branch 'master' into f-docker-any-network
2015-11-17 17:22:13 -08:00
Chris Bednarski
9cad290b18
Merge pull request #436 from hashicorp/f-docker-cleanup
...
Cleanup docker driver
2015-11-17 17:13:17 -08:00
Chris Bednarski
b22b5eb3aa
Inline err assignment
2015-11-17 17:12:45 -08:00
Chris Bednarski
a2f4188246
Streamline reading boolean values from the driver / job config
2015-11-17 16:58:23 -08:00
Chris Bednarski
67ee502acb
Added missing linebreaks for log.Printf calls
2015-11-17 16:49:01 -08:00
Chris Bednarski
43aaf94383
Do Itoa once so line items are simpler
2015-11-17 16:31:47 -08:00
Chris Bednarski
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
Chris Bednarski
3b7c252090
Improve phrasing in log messages
2015-11-17 15:17:44 -08:00
Alex Dadgar
7551a263c5
Merge pull request #389 from achanda/name
...
Set a name for the container
2015-11-17 15:07:23 -08:00
Chris Bednarski
629cdd6baa
Clean up extraneous variables
2015-11-17 14:51:38 -08:00
