Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Nov 26, 2024
1 parent 361a671 commit c4ff64d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
matrix:
include:
- distro: debian10
ansible-version: '>=9, <10'
- distro: debian11
- distro: debian12
- distro: ubuntu1804
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ Set up the latest version of [Docker Engine](https://docs.docker.com/engine/) in

#### Requirements

* `apt-transport-https` (will be installed)
* `ca-certificates` (will be installed)
* `curl` (will be installed)
* `software-properties-common` (will be installed)
* `dirmngr` (will be installed)
* `apt-transport-https` (will be installed)
* `wget` (will be installed)
* `coreutils` (will be installed)
* `apparmor` (will be installed)
* `linux-image-extra-virtual` (will be installed, Ubuntu only)
* `cgroup-lite` (will be installed, Ubuntu only)
* `linux-image-extra-virtual` (will be installed, `Ubuntu` only)
* `cgroup-lite` (will be installed, `Ubuntu` only)

#### Variables

Expand All @@ -22,8 +23,8 @@ Set up the latest version of [Docker Engine](https://docs.docker.com/engine/) in
* `docker_etc_default_http_proxy` [optional]: If you need Docker to use an HTTP proxy, it can (also) be specified here (e.g. `http://127.0.0.1:3128/`)
* `docker_etc_default_tmpdir` [optional]: This is also a handy place to tweak where Docker's temporary files go (e.g. `/mnt/bigdrive/docker-tmp`)

* `docker_manage_ufw` [default: `true`]: Whether or not `ufw` should be managed (change default `FORWARD` policy) by this role
* `docker_manage_updatedb` [default: `true`]: Whether or not `updatedb` should be managed (disable indexing of `/var/lib/docker`) by this role
* `docker_manage_ufw` [default: `true`]: Whether `ufw` should be managed (change default `FORWARD` policy) by this role
* `docker_manage_updatedb` [default: `true`]: Whether `updatedb` should be managed (disable indexing of `/var/lib/docker`) by this role

## Dependencies

Expand Down
12 changes: 6 additions & 6 deletions tasks/repository.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
tags:
- docker-repository-keyrings-directory-create

- name: repository | (keyring) file | download
ansible.builtin.apt_key:
url: "{{ docker_keyring_src }}"
keyring: "{{ docker_keyring_dst }}"
state: present
- name: repository | (keyring) file | download # noqa command-instead-of-module risky-shell-pipe
ansible.builtin.shell: >
wget -O {{ docker_keyring_dst }} {{ docker_keyring_src }}
args:
creates: "{{ docker_keyring_dst }}"
tags:
- insync-repository-keyring-file-download
- docker-repository-keyring-file-download

- name: repository | add
ansible.builtin.apt_repository:
Expand Down
4 changes: 2 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ docker_dependencies_pre:
- software-properties-common
- dirmngr
- apt-transport-https
- wget
- coreutils
- apparmor
- "{{ (ansible_distribution == 'Ubuntu') | ternary('linux-image-extra-virtual', '') }}"
- "{{ (ansible_distribution == 'Ubuntu') | ternary('cgroup-lite', '') }}"

docker_downloads_path: /var/lib/ansible/docker/downloads

docker_dependencies:
- docker-ce

Expand Down

0 comments on commit c4ff64d

Please sign in to comment.