wip

ansible/roles/docker/README.md

@@ -12,10 +12,28 @@ Install and configure the [docker](https://www.docker.com/) daemon
 docker_check_kernel: '3.10'
 ```
 
-* `docker_check_machine` - Hosts architecture needed to run docker
+* `docker_daemon_config_directory` - Path to docker daemon configuration files
 
 ``` yaml
-docker_check_machine: 'x86_64'
+docker_daemon_config_directory: '/etc/docker'
+```
+
+* `docker_daemon_config_file` - Docker daemon configuration file
+
+``` yaml
+docker_daemon_config_file: "{{docker_daemon_config_directory}}/daemon.json"
+```
+
+* `docker_daemon_config_file` - Docker daemon configuration file
+
+``` yaml
+docker_daemon_config_storage: 'overlay2'
+```
+
+* `docker_daemon_config` - docker daemon yaml config
+
+``` yaml
+docker_daemon_config: { "storage-driver": "devicemapper" }
 ```
 
 * `docker_package` - Name of the docker package

ansible/roles/docker/defaults/main.yml

@@ -11,7 +11,7 @@ docker_daemon_config_directory: "/etc/docker"
 docker_daemon_config_file: "{{docker_daemon_config_directory}}/daemon.json"
 
 # configure docker daemon storage driver
-docker_daemon_config_storage: "{% if ansible_cmdline.fstype == 'btrfs'%}btrfs{% endif %}"
+docker_daemon_config_storage: "overlay2"
 
 # docker daemon configuration
 docker_daemon_config: {}

ansible/roles/docker/tasks/config.yml

@@ -12,8 +12,8 @@
     docker_daemon_config: "{{ lookup('file',docker_daemon_config_file)|default('{}')|from_json}}"
   ignore_errors: true
 
-- name: config - add docker daemon storage configuration for btrfs
-  when: docker_package|length > 0
+- name: config - add docker daemon storage configuration
+  when: false and docker_package|length > 0
   template:
     src: daemon.json.j2
     dest: "{{docker_daemon_config_file}}"

ansible/roles/docker/tasks/myos.yml

@@ -3,7 +3,7 @@
 
 - name: myos - register myos.tags
   set_fact:
-    myos_tags: "{{ lookup('env', 'MYOS_TAGS_JSON')|from_json or lookup('file', '~/.env') }}"
+    myos_tags: "{{ lookup('env', 'MYOS_TAGS_JSON')|from_json }}"
   tags: debug
 
 - debug:

ansible/roles/docker/tasks/packages.yml

@@ -2,6 +2,7 @@
 # file: tasks/packages.yml
 
 - name: packages - install/remove docker packages
+  when: docker_packages is defined
   with_items: "{{ docker_packages|default([]) }}"
   package: name="{{item.name}}" state="{{item.state}}"
   become: yes

ansible/roles/docker/tasks/services.yml

@@ -2,7 +2,7 @@
 # file: tasks/services.yml
 
 - name: services - enable/disable docker services
-  when: ansible_service_mgr|lower != "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower != "openrc"
   with_items: "{{ docker_services|default([]) }}"
   service:
     name: "{{item.name}}"
@@ -11,13 +11,13 @@
   become: yes
 
 - name: services - openrc - force service status
-  when: ansible_service_mgr|lower == "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower == "openrc"
   shell: "kill -0 $(cat /run/{{item.name}}.pid) && [ ! -h /run/openrc/started/{{item.name}} ] && ln -s /etc/init.d/{{item.name}} /run/openrc/started/{{item.name}} && service {{item.name}} restart ||:"
   with_items: "{{ docker_services|default([]) }}"
   become: yes
 
 - name: services - openrc - enable/disable docker services
-  when: ansible_service_mgr|lower == "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower == "openrc"
   with_items: "{{ docker_services|default([]) }}"
   service:
     name: "{{item.name}}"

ansible/roles/docker/vars/debian.yml

@@ -8,6 +8,7 @@ docker_packages:
   - { "name": "apt-transport-https", "state": "present" }
   - { "name": "ca-certificates", "state": "present" }
   - { "name": "curl", "state": "present" }
+  - { "name": "docker-compose", "state": "present" }
   - { "name": "gnupg2", "state": "present" }
   - { "name": "software-properties-common", "state": "present" }