Merge pull request #150 from tgross/gh149_stopTimeout_config_key

Remove stopTimeout from configMap before checking unknown keys
TritonDataCenter · May 11, 2016 · d0db66d · d0db66d
2 parents 8e8583c + 5d716d3
commit d0db66d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -349,6 +349,7 @@ func decodeConfig(configMap map[string]interface{}, result *rawConfig) error {
 	delete(configMap, "preStart")
 	delete(configMap, "preStop")
 	delete(configMap, "postStop")
+	delete(configMap, "stopTimeout")
 	delete(configMap, "services")
 	delete(configMap, "backends")
 	delete(configMap, "tasks")

diff --git a/core/app_test.go b/core/app_test.go
@@ -16,6 +16,7 @@ var testJSON = `{
 	"preStart": "/bin/to/preStart.sh arg1 arg2",
 	"preStop": ["/bin/to/preStop.sh","arg1","arg2"],
 	"postStop": ["/bin/to/postStop.sh"],
+	"stopTimeout": 5,
 	"services": [
 			{
 					"name": "serviceA",

diff --git a/integration_tests/fixtures/nginx/Dockerfile b/integration_tests/fixtures/nginx/Dockerfile
@@ -9,8 +9,8 @@ RUN apk update && apk add \
     && rm -rf /var/cache/apk/*
 
 # we use consul-template to re-write our Nginx virtualhost config
-RUN curl -Lo /tmp/consul_template_0.11.0_linux_amd64.zip https://github.com/hashicorp/consul-template/releases/download/v0.11.0/consul_template_0.11.0_linux_amd64.zip && \
-    unzip /tmp/consul_template_0.11.0_linux_amd64.zip && \
+RUN curl -Lo /tmp/consul_template_0.14.0_linux_amd64.zip https://releases.hashicorp.com/consul-template/0.14.0/consul-template_0.14.0_linux_amd64.zip && \
+    unzip /tmp/consul_template_0.14.0_linux_amd64.zip && \
     mv consul-template /bin
 
 # Add confd to re-write our Nginx config from etcd