Chris Bednarski
fc95a3c9dc
Fix some issues caught by go vet
2015-11-20 16:01:27 -08:00
Chris Bednarski
61aeace69a
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
6bbc977fe5
Renamed whitelisted to skipped and update debug line
2015-11-20 14:07:35 -08:00
Chris Bednarski
c298425917
Added client checks back to the tests that can't use dockerSetup()
2015-11-20 13:50:47 -08:00
Chris Bednarski
e5d5d42b13
Added nil to network.MapLabelToValues call
2015-11-19 22:18:19 -08:00
Chris Bednarski
63439ee3f7
Squash []map[string]type for port_map and labels into map[string]type
2015-11-19 21:29:37 -08:00
Chris Bednarski
f75404ecf7
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
a8fd3310e8
Tests
2015-11-19 16:43:08 -08:00
Alex Dadgar
5eb8bc25bf
Implement the driver whitelist
2015-11-19 16:39:21 -08:00
Chris Bednarski
8c1d762a75
Export DockerHandle and change tests to use DockerHandle.ContainerID()
2015-11-19 14:20:41 -08:00
Chris Bednarski
84f9bb1367
Add ContainerID() method to get the containerID from a handle
2015-11-19 13:57:18 -08:00
Chris Bednarski
5ecb499d9e
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
fde90ca2c2
fix docker port allocation?
2015-11-19 19:15:25 +01:00
Alex Dadgar
82bfeb63df
Fix network fingerprint test
2015-11-19 09:22:32 -08:00
Diptanu Choudhury
1e1f5b00f0
Merge pull request #464 from hashicorp/f-consul-check
...
Changing the code comment
2015-11-18 19:35:15 -08:00
Diptanu Choudhury
e0d42e48b9
Changing the code comment
2015-11-18 19:34:50 -08:00
Alex Dadgar
cc93553c02
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
016a9d5c05
Nuking the service and registering it so that checks are cleaned up
2015-11-18 19:31:29 -08:00
Alex Dadgar
77be23c038
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
5e1f7c41a9
Allow no interfaces in network fingerprinter
2015-11-18 19:01:39 -08:00
Diptanu Choudhury
aded72d95d
Triggering the next sync after we have finished the current one
2015-11-18 18:47:12 -08:00
Diptanu Choudhury
27819a8b33
Making sure we sync the real state of services of a Task with Consul
2015-11-18 18:35:22 -08:00
Chris Hines
3fe4d85c81
Handle additional edge cases when parsing environment variables.
2015-11-18 21:21:07 -05:00
Diptanu Choudhury
1aff29bc52
Updating checks and services when allocs are refreshed
2015-11-18 17:33:29 -08:00
Diptanu Choudhury
6c399ac5b9
Added a test to ensure invalid services are not registered
2015-11-18 17:29:12 -08:00
Alex Dadgar
7357979089
Revert "Revert "Make drivers take arguments as a list and not as a string""
2015-11-18 15:16:42 -08:00
Diptanu Choudhury
ba8e3fcbae
Merge pull request #455 from hashicorp/f-consul-check
...
Refactor consul check
2015-11-18 14:33:34 -08:00
Diptanu Choudhury
bcfda2687e
Added a check for accpeting protocol information in consul check
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
d4b1b9240e
Added a test to check check creation
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
0c5ddfae6b
Added a test to check check creation
2015-11-18 14:29:55 -08:00
Diptanu Choudhury
197e755506
Changed the http field to path
2015-11-18 14:29:55 -08:00
Alex Dadgar
d666f5bde1
Revert "Make drivers take arguments as a list and not as a string"
2015-11-18 13:46:43 -08:00
Alex Dadgar
5aaa0553cf
Remove returning the error
2015-11-18 12:40:34 -08:00
Alex Dadgar
d0ebac1513
More test fixes
2015-11-18 12:30:42 -08:00
Alex Dadgar
62a0c5d14c
Rebase
2015-11-18 12:30:35 -08:00
Alex Dadgar
c6a895aff7
Fix executor tests
2015-11-18 12:29:04 -08:00
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
