Skip to content

Commit 1056331

Browse files
committed
refactor(linter): fixes linter warnings
1 parent db39cb6 commit 1056331

File tree

5 files changed

+44
-30
lines changed

5 files changed

+44
-30
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vscode/settings.json

handlers/main.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
---
12
- name: Restart docker
2-
service:
3+
ansible.builtin.service:
34
name: docker
45
state: restarted
56

67
- name: Reload systemd
7-
command: systemctl daemon-reload
8+
ansible.builtin.systemd:
9+
daemon-reload: true
810
notify:
911
- Restart docker
10-

meta/main.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ dependencies: []
44

55
galaxy_info:
66
author: Michel Blanc
7-
company: ACME Corp
7+
company: devops.works
8+
role_name: docker
9+
namespace: devopsworks
810
description: ansible-docker role
911
license: MIT
10-
min_ansible_version: 1.6
12+
min_ansible_version: "2.12"
1113
platforms:
12-
- name: Ubuntu
13-
versions:
14-
- all
15-
categories:
16-
- web
14+
- name: Ubuntu
15+
versions:
16+
- all
17+
galaxy_tags:
18+
- web

tasks/docker.yml

+25-16
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,81 @@
11
---
2+
# yamllint disable rule:line-length
3+
- name: Adds GPG package
4+
ansible.builtin.apt:
5+
name: gnupg
6+
state: present
7+
28
- name: Adds docker key
3-
apt_key:
9+
ansible.builtin.apt_key:
410
url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg
511
state: present
612

713
- name: Adds docker repos
8-
apt_repository:
14+
ansible.builtin.apt_repository:
915
repo: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_lsb.codename }} stable"
1016
state: present
1117
tags: docker
1218

1319
- name: Installs docker engine
14-
apt:
20+
ansible.builtin.apt:
1521
pkg: ["docker-ce={{ docker_version }}", "python3-pip", "python3-docker", "docker-ce-cli", "containerd.io", "python3-setuptools"]
16-
install_recommends: no
22+
install_recommends: false
1723
state: present
1824
tags: docker
1925
register: __docker_installed
2026

2127
- name: Removes creds helper
22-
apt:
28+
ansible.builtin.apt:
2329
pkg: golang-docker-credential-helpers
2430
state: absent
2531

2632
- name: Installs docker compose (Ubuntu > 18.04)
27-
get_url:
33+
ansible.builtin.get_url:
2834
url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64
2935
dest: /usr/local/bin/docker-compose
3036
owner: root
3137
group: root
32-
mode: 0555
38+
mode: "0555"
3339

3440
- name: Uninstall docker-py module
35-
pip:
41+
ansible.builtin.pip:
3642
name: docker-py
3743
state: absent
38-
ignore_errors: true
44+
register: __docker_py_uninstalled
45+
failed_when: __docker_py_uninstalled is failed
3946

4047
- name: Installs websocket
41-
apt:
48+
ansible.builtin.apt:
4249
pkg: python3-websocket
4350
state: present
4451

4552
- name: Installs docker-compose python support
46-
pip:
53+
ansible.builtin.pip:
4754
name: docker-compose
4855
state: present
4956

5057
- name: Adds docker options if any 1/2
51-
file:
58+
ansible.builtin.file:
5259
path: /etc/systemd/system/docker.service.d/
5360
state: directory
61+
mode: "0755"
5462
when: docker_daemon_options != ""
5563

5664
- name: Adds docker options if any 2/2
57-
template:
65+
ansible.builtin.template:
5866
src: systemd_options.conf.j2
5967
dest: /etc/systemd/system/docker.service.d/options.conf
68+
mode: "0644"
6069
when: docker_daemon_options != ""
6170
notify:
6271
- Reload systemd
6372

6473
- name: Flushes handlers
65-
meta: flush_handlers
74+
ansible.builtin.meta: flush_handlers
6675

6776
- name: Ensure daemon is started
68-
service:
77+
# noqa: no-handler
78+
ansible.builtin.service:
6979
name: docker
7080
state: started
7181
when: __docker_installed is changed
72-

tasks/main.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
22
- name: Check if docker binary exists
3-
stat:
3+
ansible.builtin.stat:
44
path: /usr/bin/docker
55
register: __docker
66
tags:
77
- docker
8-
9-
- include_tasks:
8+
9+
- name: Docker tasks
10+
ansible.builtin.include_tasks:
1011
file: docker.yml
1112
apply:
1213
tags:
1314
- docker
1415
when: not __docker.stat.exists
1516
tags:
16-
- always
17+
- always

0 commit comments

Comments
 (0)