Skip to content

Commit

Permalink
Fix for apt name
Browse files Browse the repository at this point in the history
  • Loading branch information
Leonid S Shestera committed Dec 2, 2019
1 parent 05488b8 commit 3d9b1f9
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"**/*.yml": "ansible"
}
}
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ Available variables are listed below, along with default values (see `defaults/m

# Edition can be one of: 'ce' (Community Edition) or 'ee' (Enterprise Edition).
docker_edition: 'ce'
docker_package: "docker-{{ docker_edition }}"
docker_package_state: present
docker_packages:
- "docker-{{ docker_edition }}"
- "docker-{{ docker_edition }}-cli"
- containerd.io
docker_packages_state: present

The `docker_edition` should be either `ce` (Community Edition) or `ee` (Enterprise Edition). You can also specify a specific version of Docker to install using the distribution-specific format: Red Hat/CentOS: `docker-{{ docker_edition }}-<VERSION>`; Debian/Ubuntu: `docker-{{ docker_edition }}=<VERSION>`.

Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ galaxy_info:
description: Docker for Linux.
license: "license (BSD, MIT)"
role_name: docker
min_ansible_version: 2.4
min_ansible_version: 3.0
platforms:
- name: EL
versions:
Expand Down
2 changes: 2 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
state: "{{ docker_service_state }}"
enabled: "{{ docker_service_enabled }}"

# TODO: Добавить cron на отчистку диска

- name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers

Expand Down
2 changes: 2 additions & 0 deletions tasks/setup-Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
name:
- apt-transport-https
- ca-certificates
- gnupg-agent
- zfsutils-linux
state: present

- name: Add Docker apt key.
Expand Down
4 changes: 2 additions & 2 deletions templates/apt-preferences-docker.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: {{ docker_package }}
Package: docker-{{ docker_edition }}
Pin: version {{ docker_apt_version }}.*
Pin-Priority: 1000

Package: {{ docker_package }}-cli
Package: docker-{{ docker_edition }}-cli
Pin: version {{ docker_apt_version }}.*
Pin-Priority: 1000

0 comments on commit 3d9b1f9

Please sign in to comment.