configurations must reside in dedicated directory

* consul-template reads it recursively from the specified conf directory
seges · Jun 2, 2015 · d5479dd · d5479dd
1 parent d7dbd5c
commit d5479dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,8 @@ This Docker image follows official Nginx image extended with Consul Template to
 Create your data volume image and place required configuration files based on the following matrix:
 
 * /etc/nginx/conf.d -> nginx configuration
-* /etc/consul-template -> Consul Template configurations taken and merged alphabetically - https://github.com/hashicorp/consul-template
+* /etc/consul-template/conf -> Consul Template configurations taken and merged alphabetically - https://github.com/hashicorp/consul-template
+* /etc/consul-template/templates -> a good place to situate your templates defined in the configuration
 
 # Run
 

diff --git a/consul-template.service b/consul-template.service
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec consul-template -config "/etc/consul-template"
+exec consul-template -config "/etc/consul-template/conf"
diff --git a/docker-push.sh b/docker-push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+  echo "Provide version"
+  exit 42
+fi
+
+version=":$1"
+
+docker push seges/nginx-consul$version