Merge pull request #2 from hellofresh/add-docker-conf

make docker conf configurable

handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: restart docker
+  service: 
+    name="docker"
+    state="restarted"
+

tasks/composer.yml → tasks/docker-compose.yml

@@ -1,12 +1,12 @@
 ---
 
-- name: Ensure composer dir exists
+- name: Ensure docker compose dir exists
   file: 
     path="{{ docker_compose_dir }}"
     mode=0755
     state="directory"
 
-- name: Download composer 
+- name: Download docker compose
   get_url: 
     url="{{ docker_compose_url }}"
     dest="{{ docker_compose_dir }}/{{ docker_compose_file }}"

tasks/main.yml

@@ -19,10 +19,17 @@
   apt:
     pkg="docker-engine"
 
-- name: Include composer
-  include: composer.yml
+- name: Include docker-compose.yml
+  include: docker-compose.yml
   when: docker_compose_install
 
+- name: Include docker conf
+  template: 
+    src=docker_conf_ubuntu_14.04.j2
+    dest=/etc/default/docker
+  notify: 
+    - restart docker
+
 - name: Ensure docker is running and starts by default
   service: 
     name="docker"

templates/docker_conf_ubuntu_14.04.j2

@@ -0,0 +1,29 @@
+# {{ ansible_managed }}
+# Docker Upstart and SysVinit configuration file
+
+#
+# THIS FILE DOES NOT APPLY TO SYSTEMD
+#
+#   Please see the documentation for "systemd drop-ins":
+#   https://docs.docker.com/engine/articles/systemd/
+#
+
+# Customize location of Docker binary (especially for development testing).
+{% if dockerhost_dockererd is defined %}
+DOCKERD="{{ dockerhost_dockererd }}"
+{% endif %}
+
+# Use DOCKER_OPTS to modify the daemon startup options.
+{% if dockerhost_docker_opts is defined %}
+DOCKER_OPTS="{{ dockerhost_docker_opts }}"
+{% endif %}
+
+# If you need Docker to use an HTTP proxy, it can also be specified here.
+{% if dockerhost_http_proxy is defined %}
+export http_proxy="{{ dockerhost_http_proxy }}"
+{% endif %}
+
+# This is also a handy place to tweak where Docker's temporary files go.
+{% if dockerhost_tmpdir is defined %}
+export TMPDIR="{{ dockerhost_tmpdir }}"
+{% endif %}