Fix some lint
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Adrien Reslinger 2020-06-04 21:07:29 +02:00
parent 8fbd68eb71
commit 5ce0140b54
4 changed files with 47 additions and 16 deletions

View file

@ -7,12 +7,19 @@
- docker_ver == "docker_ce"
- name: add docker repository
apt_repository: repo='deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ansible_distribution_release}} stable' state=present update_cache=yes
apt_repository:
repo: 'deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable'
state: present
update_cache: yes
when:
- docker_ver == "docker_ce"
- name: "Ensure GRUB_CMDLINE_LINUX is updated"
lineinfile: dest=/etc/default/grub regexp='^(GRUB_CMDLINE_LINUX=".*)"$' line='\1 cgroup_enable=memory swapaccount=1"' backrefs=yes
lineinfile:
dest: /etc/default/grub
regexp: '^(GRUB_CMDLINE_LINUX=".*)"$'
line: '\1 cgroup_enable=memory swapaccount=1"'
backrefs: yes
when:
- not docker_installed.stat.exists
@ -22,7 +29,11 @@
- not docker_installed.stat.exists
- name: "Ensure DEFAULT_FORWARD_POLICY in /etc/default/ufw is updated"
lineinfile: dest=/etc/default/ufw regexp='^(DEFAULT_FORWARD_POLICY=").*"$' line='\1ACCEPT"' backrefs=yes
lineinfile:
dest: /etc/default/ufw
regexp: '^(DEFAULT_FORWARD_POLICY=").*"$'
line: '\1ACCEPT"'
backrefs: yes
notify: reload ufw
tags: [docker,firewall]

View file

@ -13,18 +13,27 @@
- name: Install docker rules for {{ ansible_os_family }} OS family
include_tasks: "{{ ansible_os_family }}.yml"
- name: Remove all other's docker version packages
package: name="{{ docker_remove_packages_name }}" state=absent update_cache=yes
package:
name: "{{ docker_remove_packages_name }}"
state: absent
update_cache: yes
- name: Install docker
package: name="{{ docker_package_name }}" state=latest update_cache=yes
package:
name: "{{ docker_package_name }}"
state: present
update_cache: yes
# when:
# - not docker_installed.stat.exists
notify: Restart docker
- name: Enable docker on boot
service: name=docker state=started enabled=yes
service:
name: docker
state: started
enabled: yes
# Create docker group if needed
@ -61,7 +70,10 @@
#- interfaces docker0 and docker_gwbridge ? firewall-cmd --change-zone=docker0 --zone=trusted --permanent; firewall-cmd --change-zone=docker_gwbridge --zone=trusted --permanent
- name: Install python library for docker
package: name="{{ docker_python_lib }}" state=latest update_cache=yes
package:
name: "{{ docker_python_lib }}"
state: present
update_cache: yes
#- name: Enable swarm mode
# include_tasks: swarm.yml

View file

@ -1,7 +1,8 @@
---
# Docker machine
- name: Check if docker-machine is already installed
stat: path=/usr/local/bin/docker-machine
stat:
path: /usr/local/bin/docker-machine
register: dockermachine
- name: Check local version installed
@ -12,7 +13,7 @@
- dockermachine.stat.exists
- name: Check online version
shell: curl -s https://github.com/docker/machine/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
shell: set -o pipefail && curl -s https://github.com/docker/machine/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
register: dockermachine_ver
changed_when: false
- name: "Retreive docker-machine version {{ dockermachine_ver.stdout }}"
@ -24,7 +25,7 @@
mode: 0755
- name: Check docker-machine-driver-kvm online version
shell: curl -s https://github.com/dhiltgen/docker-machine-kvm/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
shell: set -o pipefail && curl -s https://github.com/dhiltgen/docker-machine-kvm/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
register: dockermachinekvm_ver
changed_when: false
- name: Retreive docker-machine-driver-kvm
@ -44,7 +45,7 @@
mode: 0755
#- name: Check docker-machine-driver-scaleway online version
# shell: curl -s https://github.com/scaleway/docker-machine-driver-scaleway/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
# shell: set -o pipefail && curl -s https://github.com/scaleway/docker-machine-driver-scaleway/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
# register: dockermachinescw_ver
# changed_when: false
#- name: Retreive docker-machine-driver-scaleway
@ -57,11 +58,12 @@
# docker-compose
- name: Check if docker-compose is already installed
stat: path=/usr/local/bin/docker-compose
stat:
path: /usr/local/bin/docker-compose
register: dockercompose
- name: Check online version
shell: curl -s https://github.com/docker/compose/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
shell: set -o pipefail && curl -s https://github.com/docker/compose/releases/latest | sed 's|.*tag/\(.*\)".*|\1|'
register: dockercompose_ver
changed_when: false

View file

@ -6,10 +6,16 @@
enabled: no
- name: Remove all other's docker version packages
package: name="{{ docker_remove_packages_name }}" state=absent update_cache=yes
package:
name: "{{ docker_remove_packages_name }}"
state: absent
update_cache: yes
- name: Remove docker
package: name="{{ docker_package_name }}" state=absent update_cache=yes
package:
name: "{{ docker_package_name }}"
state: absent
update_cache: yes
- name: Remove files and directories
file: