Merge pull request #91 from ipfs/container-logs

docker: disable container logs, closes #29
ipfs · Sep 18, 2015 · 59d9aa3 · 59d9aa3
2 parents 1a68066 + 5fc3ecd
commit 59d9aa3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/solarnet/common.yml b/solarnet/common.yml
@@ -2,6 +2,8 @@
 - hosts: all
   pre_tasks:
     - include_vars: secrets_plaintext/secrets.yml
+  handlers:
+    - include: roles/nginx/handlers/main.yml
   roles:
     - common
     - docker

diff --git a/solarnet/roles/docker/handlers/main.yml b/solarnet/roles/docker/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: restart docker
+  service:
+    name: docker
+    state: restarted
diff --git a/solarnet/roles/docker/tasks/main.yml b/solarnet/roles/docker/tasks/main.yml
@@ -19,3 +19,19 @@
 
 - name: "create directory for containers"
   file: path=/containers state=directory
+
+# XXX migration
+- lineinfile:
+    dest: /etc/default/docker
+    line: 'DOCKER_OPTS=--log-driver=none'
+    state: absent
+  notify:
+    - restart docker
+
+- name: disable container logs
+  lineinfile:
+    dest: /etc/default/docker
+    line: 'DOCKER_OPTS="$DOCKER_OPTS --log-driver=none"'
+    state: present
+  notify:
+    - restart docker