Merge pull request #10 from ministryofjustice/data-docker-directory

Add support for different docker directory
ministryofjustice · Jun 2, 2016 · 73f4c1c · 73f4c1c
2 parents 0a07787 + 77d1dc5
commit 73f4c1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/docker/map.jinja b/docker/map.jinja
@@ -3,6 +3,7 @@
         'pkg': 'lxc-docker',
         'pkg_version': '1.6.2',
         'py_version': '1.2.2',
+        'datadir': '',
     },
     'default': 'Debian',
 }, merge=salt['pillar.get']('docker',{})) %}
diff --git a/docker/templates/docker/default b/docker/templates/docker/default
@@ -1,10 +1,14 @@
+{% from "docker/map.jinja" import docker with context %}
 # Docker Upstart and SysVinit configuration file
 
 # Customize location of Docker binary (especially for development testing).
 #DOCKER="/usr/local/bin/docker"
 
 # Use DOCKER_OPTS to modify the daemon startup options.
 #DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
+{% if docker.datadir %}
+DOCKER_OPTS="${DOCKER_OPTS} -g {{ docker.datadir }}"
+{% endif %}
 
 # If you need Docker to use an HTTP proxy, it can also be specified here.
 #export http_proxy="http://127.0.0.1:3128/"