diff --git a/.ansible-lint b/.ansible-lint index effd2a2..0be362d 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -2,4 +2,5 @@ exclude_paths: - molecule skip_list: - 601 + - literal-compare use_default_rules: true diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..16d3c4d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.cache diff --git a/README.md b/README.md index 14bffe2..e5c4da0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Ansible role that installs on linux Docker CE + Docker Compose + Python Docker S - ✔️ Installing Docker Compose - You can define which version should be installed - You can skip installation - - Double-check that the newest version of `pip` is installed + - Double-check that the last cross-python version of `pip` is installed (20.3.4) - ✔️ Installing Python Docker SDK - You can define which version should be installed - You can skip installation @@ -25,6 +25,7 @@ Ansible role that installs on linux Docker CE + Docker Compose + Python Docker S - ✔️ Ubuntu 16.04 (Xenial) - ✔️ Ubuntu 18.04 (Bionic) +- ✔️ Ubuntu 20.04 (Focal) - ✔️ CentOS 7 ## Requirements @@ -36,8 +37,8 @@ Ansible role that installs on linux Docker CE + Docker Compose + Python Docker S Variable | Description | Default Value --- | --- | --- -`docker_sdk_version` | Version of Python Docker SDK to be installed. Set `no` to skip installation | `4.2.0` -`docker_compose_version` | Version of Docker Compose to be installed. Set `no` to skip installation | `1.25.4` +`docker_sdk_version` | Version of Python Docker SDK to be installed. Set `no` to skip installation | `4.4.4` +`docker_compose_version` | Version of Docker Compose to be installed. Set `no` to skip installation | `1.26.2` `docker_user` | User that should be allowed to use Docker | _ansible_user_id_ ## Dependencies diff --git a/defaults/main.yml b/defaults/main.yml index 1045b73..c6db1ef 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,4 @@ --- -docker_sdk_version: 4.2.0 -docker_compose_version: 1.25.4 +pip_version: 20.3.4 +docker_sdk_version: 4.4.4 +docker_compose_version: 1.26.2 diff --git a/meta/main.yml b/meta/main.yml index be6b387..13532c1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: role_name: docker-ce author: marverix @@ -9,6 +10,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - focal - bionic - xenial diff --git a/molecule/base.yml b/molecule/base.yml index 3cb388e..813ebae 100644 --- a/molecule/base.yml +++ b/molecule/base.yml @@ -24,6 +24,13 @@ platforms: volumes: - /var/run/docker.sock:/var/run/docker.sock:rw + - name: ubuntu20 + image: bitbar/ubupy:focal + pre_build_image: true + privileged: true + volumes: + - /var/run/docker.sock:/var/run/docker.sock:rw + - name: centos7 image: pycontribs/centos:7 pre_build_image: true diff --git a/tasks/main.yml b/tasks/main.yml index b7fd3be..a8abdef 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,6 +2,7 @@ - name: "Update pip" pip: name: pip + version: "{{ pip_version }}" extra_args: --upgrade # https://docs.docker.com/install/linux/docker-ce/ubuntu/ diff --git a/test.sh b/test.sh old mode 100644 new mode 100755