Skip to content

Commit

Permalink
Updating versions + Support for Ubuntu Focal
Browse files Browse the repository at this point in the history
  • Loading branch information
Marek Sierociński committed Apr 7, 2021
1 parent f892002 commit 89aa4b8
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 5 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ exclude_paths:
- molecule
skip_list:
- 601
- literal-compare
use_default_rules: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.cache
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
galaxy_info:
role_name: docker-ce
author: marverix
Expand All @@ -9,6 +10,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- focal
- bionic
- xenial

Expand Down
7 changes: 7 additions & 0 deletions molecule/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Empty file modified test.sh
100644 → 100755
Empty file.

0 comments on commit 89aa4b8

Please sign in to comment.