Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle python3-pip for Ubunt 20.04 and Update Documentation #86

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Handle python3-pip for Ubunt 20.04 and Update Documentation #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4763ff2
Update add example for docker_daemon_config:
jifox Oct 3, 2020
36670e3
Handle python3-pip
jifox Oct 3, 2020
4e6a2de
Update README.md
jifox Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Ansible Role: Docker
====================

[![Build Status](https://travis-ci.org/atosatto/ansible-dockerswarm.svg?branch=master)](https://travis-ci.org/atosatto/ansible-dockerswarm)
[![Build Status](https://travis-ci.org/jifox/ansible-dockerswarm.svg?branch=master)](https://travis-ci.org/jifox/ansible-dockerswarm)
[![License](https://img.shields.io/badge/license-MIT%20License-brightgreen.svg)](https://opensource.org/licenses/MIT)
[![Ansible Role](http://img.shields.io/badge/galaxy-atosatto.docker--swarm-blue.svg?style=flat-square)](https://galaxy.ansible.com/atosatto/docker-swarm)
[![GitHub tag](https://img.shields.io/github/tag/atosatto/ansible-dockerswarm.svg)](https://github.com/atosatto/ansible-dockerswarm/tags)
[![GitHub tag](https://img.shields.io/github/tag/atosatto/ansible-dockerswarm.svg)](https://github.com/jifox/ansible-dockerswarm/tags)

Setup Docker on RHEL/CentOS and Debian/Ubuntu servers. <br />
The role supports Docker Engine's "Swarm Mode" (https://docs.docker.com/engine/swarm/) to create a cluster of Docker nodes.
Expand Down Expand Up @@ -66,6 +66,13 @@ State of the Docker service.

docker_daemon_config: {}

example:
docker_daemon_config:
bip: 10.148.8.1/24
default-address-pools:
- base: "10.149.0.0/16"
size": 23

Dictionary of Docker deamon configuration options to be written to `/etc/docker/daemon.json`.
See [Daemon configuration file](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file) for the detailed documentation of the available options.

Expand Down
4 changes: 2 additions & 2 deletions vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---

python_pip_packages:
- python-pip
- "{% if ansible_python_version is version_compare('3.0.0', '<') %}python-pip{% else %}python3-pip{% endif %}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great fix. # This makes atosatto/ansible-dockerswarm compatible with ubuntu 20.04


python_sni_support_packages:
- python-dev
- "{% if ansible_python_version is version_compare('3.0.0', '<') %}python-dev{% else %}python3-dev{% endif %}"
- libssl-dev
- libffi-dev

Expand Down