File tree Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Original file line number Diff line number Diff line change 3
3
'pkg' : 'lxc-docker' ,
4
4
'pkg_version' : '1.6.2' ,
5
5
'py_version' : '1.2.2' ,
6
+ 'datadir' : '' ,
6
7
},
7
8
'default' : 'Debian' ,
8
9
}, merge =salt ['pillar.get' ]('docker' ,{})) %}
Original file line number Diff line number Diff line change
1
+ {% from "docker/map.jinja" import docker with context %}
1
2
# Docker Upstart and SysVinit configuration file
2
3
3
4
# Customize location of Docker binary (especially for development testing).
4
5
#DOCKER="/usr/local/bin/docker"
5
6
6
7
# Use DOCKER_OPTS to modify the daemon startup options.
7
8
#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
9
+ {% if docker.datadir %}
10
+ DOCKER_OPTS="${DOCKER_OPTS} -g {{ docker.datadir }}"
11
+ {% endif %}
8
12
9
13
# If you need Docker to use an HTTP proxy, it can also be specified here.
10
14
#export http_proxy="http://127.0.0.1:3128/"
You can’t perform that action at this time.
0 commit comments